From c257ae41736b9d71acded4dc6138bb38a9fb254f Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Sun, 9 Mar 2014 17:43:11 +0000
Subject: [PATCH] Use OS_SpriteOp 65 for tiled backdrop sprites
Detail:
s/StartLoop - Use OS_SpriteOp 65 for drawing tiled backdrop sprites. Fall back to manual tiling code in softload versions if OS_SpriteOp 65 unavailable.
Admin:
Tested on Iyonix, BB-xM
Requires HdrSrc-2_42
Version 0.97. Tagged as 'Pinboard-0_97'
---
VersionASM | 12 ++++++------
VersionNum | 20 ++++++++++----------
s/StartLoop | 26 ++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/VersionASM b/VersionASM
index aa70c17..ac3dd47 100644
--- a/VersionASM
+++ b/VersionASM
@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
-Module_MajorVersion SETS "0.96"
-Module_Version SETA 96
+Module_MajorVersion SETS "0.97"
+Module_Version SETA 97
Module_MinorVersion SETS ""
-Module_Date SETS "11 Sep 2012"
-Module_ApplicationDate SETS "11-Sep-12"
+Module_Date SETS "09 Mar 2014"
+Module_ApplicationDate SETS "09-Mar-14"
Module_ComponentName SETS "Pinboard"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Pinboard"
-Module_FullVersion SETS "0.96"
-Module_HelpVersion SETS "0.96 (11 Sep 2012)"
+Module_FullVersion SETS "0.97"
+Module_HelpVersion SETS "0.97 (09 Mar 2014)"
END
diff --git a/VersionNum b/VersionNum
index 6b3c657..58137f2 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.96)
+/* (0.97)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
-#define Module_MajorVersion_CMHG 0.96
+#define Module_MajorVersion_CMHG 0.97
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 11 Sep 2012
+#define Module_Date_CMHG 09 Mar 2014
-#define Module_MajorVersion "0.96"
-#define Module_Version 96
+#define Module_MajorVersion "0.97"
+#define Module_Version 97
#define Module_MinorVersion ""
-#define Module_Date "11 Sep 2012"
+#define Module_Date "09 Mar 2014"
-#define Module_ApplicationDate "11-Sep-12"
+#define Module_ApplicationDate "09-Mar-14"
#define Module_ComponentName "Pinboard"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Pinboard"
-#define Module_FullVersion "0.96"
-#define Module_HelpVersion "0.96 (11 Sep 2012)"
-#define Module_LibraryVersionInfo "0:96"
+#define Module_FullVersion "0.97"
+#define Module_HelpVersion "0.97 (09 Mar 2014)"
+#define Module_LibraryVersionInfo "0:97"
diff --git a/s/StartLoop b/s/StartLoop
index f19f4c1..7e4daad 100644
--- a/s/StartLoop
+++ b/s/StartLoop
@@ -508,6 +508,32 @@ PlotImageScaled
PlotImageTiled
Entry "r0-r12"
+ LDR r14,backdrop_options
+ TST r14,#bd_OptionJPEG
+ BNE %FT05
+ ; Tiled sprite, use the new tiled OS_SpriteOp
+ LDR r0,Screen_y1
+ MOV r9,#1
+ LDR r10,YEig
+ ADD r4,r0,r9,LSL r10
+ LDR r0,=SpriteReason_TileSpriteScaled+512
+ MOV r1,#&8000
+ ADD r2,r1,#16
+ MOV r3,#0
+ MOV r5,#0
+ MOV r6,#0
+ MOV r7,#0
+ SWI XOS_SpriteOp
+ [ standalonemessages
+ ; Try plotting manually if it looks like the call isn't supported
+ EXIT VC
+ LDR r0,[r0]
+ LDR r1,=ErrorNumber_Sprite_BadReasonCode
+ TEQ r0,r1
+ EXIT NE
+ ]
+
+05
; Work out MinX of first tile to plot
LDR r14,[r1,#28] ; X0 of current rectangle.
--
GitLab