Commit d144771a authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix pinboard sprite caching to take into account changes in mode RGB order & alpha blending

Detail:
  s/Backdrop - Change the construction of the "compact mode word" representing the screen mode to include the RGB & alpha mode flags, so that the sprite will be re-cached when switching between screen modes with different RGB & alpha settings
Admin:
  Tested on Raspberry Pi 3


Version 1.04. Tagged as 'Pinboard-1_04'
parent f462c775
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.03"
Module_Version SETA 103
Module_MajorVersion SETS "1.04"
Module_Version SETA 104
Module_MinorVersion SETS ""
Module_Date SETS "06 May 2017"
Module_ApplicationDate SETS "06-May-17"
Module_Date SETS "01 Jul 2018"
Module_ApplicationDate SETS "01-Jul-18"
Module_ComponentName SETS "Pinboard"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Pinboard"
Module_FullVersion SETS "1.03"
Module_HelpVersion SETS "1.03 (06 May 2017)"
Module_FullVersion SETS "1.04"
Module_HelpVersion SETS "1.04 (01 Jul 2018)"
END
/* (1.03)
/* (1.04)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.03
#define Module_MajorVersion_CMHG 1.04
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 06 May 2017
#define Module_Date_CMHG 01 Jul 2018
#define Module_MajorVersion "1.03"
#define Module_Version 103
#define Module_MajorVersion "1.04"
#define Module_Version 104
#define Module_MinorVersion ""
#define Module_Date "06 May 2017"
#define Module_Date "01 Jul 2018"
#define Module_ApplicationDate "06-May-17"
#define Module_ApplicationDate "01-Jul-18"
#define Module_ComponentName "Pinboard"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Pinboard"
#define Module_FullVersion "1.03"
#define Module_HelpVersion "1.03 (06 May 2017)"
#define Module_LibraryVersionInfo "1:3"
#define Module_FullVersion "1.04"
#define Module_HelpVersion "1.04 (01 Jul 2018)"
#define Module_LibraryVersionInfo "1:4"
......@@ -65,7 +65,7 @@ LCDbackdroptile
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; MakeCompactModeWord
;
; Formulate a word that expresses bpp, eigen, palette all in one
; Formulate a word that expresses bpp, eigen, palette, RGB+alpha all in one
;
; Out : r0 = compact word
; r2 = sprite mode descriptor
......@@ -101,8 +101,19 @@ MakeCompactModeWord
ORR r0, r0, r14, LSL #20
LDRB r14, XEig
ORR r0, r0, r14, LSL #24
ORR r0, r0, #&F0000000 ; Make sure a 1bpp EX0 EY0 mode can't be mistaken
ORR r0, r0, #&C0000000 ; Make sure a 1bpp EX0 EY0 mode can't be mistaken
; for old style mode 0
; Store RGB+alpha flags too
BIC r0, r0, #&30000000
Push "r0,r2"
MOV r0, #-1
MOV r1, #VduExt_ModeFlags
SWI XOS_ReadModeVariable
ASSERT &30000000 = (ModeFlag_DataFormatSub_RGB+ModeFlag_DataFormatSub_Alpha) :SHL: 14
AND lr, r2, #ModeFlag_DataFormatSub_RGB+ModeFlag_DataFormatSub_Alpha
Pull "r0,r2"
ORR r0, r0, lr, LSL #14
CLRV
Pull "r1, pc"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment