Commit 39485b7c authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix handling of tool sprite palettes in alpha-blended screen modes

Detail:
  s/Wimp10 - Update mastertoactive to force the palette/translation table to be sent through ColourTrans if either &RGB component ordering or alpha blending is in use for the current screen mode. Otherwise, for alpha modes, the alpha channel would typically be left at zero.
Admin:
  Tested on Raspberry Pi 3


Version 5.62. Tagged as 'Wimp-5_62'
parent 6088f72b
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.61"
Module_Version SETA 561
Module_MajorVersion SETS "5.62"
Module_Version SETA 562
Module_MinorVersion SETS ""
Module_Date SETS "18 Mar 2018"
Module_ApplicationDate SETS "18-Mar-18"
Module_Date SETS "01 Jul 2018"
Module_ApplicationDate SETS "01-Jul-18"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "5.61"
Module_HelpVersion SETS "5.61 (18 Mar 2018)"
Module_FullVersion SETS "5.62"
Module_HelpVersion SETS "5.62 (01 Jul 2018)"
END
/* (5.61)
/* (5.62)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.61
#define Module_MajorVersion_CMHG 5.62
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 18 Mar 2018
#define Module_Date_CMHG 01 Jul 2018
#define Module_MajorVersion "5.61"
#define Module_Version 561
#define Module_MajorVersion "5.62"
#define Module_Version 562
#define Module_MinorVersion ""
#define Module_Date "18 Mar 2018"
#define Module_Date "01 Jul 2018"
#define Module_ApplicationDate "18-Mar-18"
#define Module_ApplicationDate "01-Jul-18"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "5.61"
#define Module_HelpVersion "5.61 (18 Mar 2018)"
#define Module_LibraryVersionInfo "5:61"
#define Module_FullVersion "5.62"
#define Module_HelpVersion "5.62 (01 Jul 2018)"
#define Module_LibraryVersionInfo "5:62"
......@@ -1079,8 +1079,9 @@ mastertoactive ROUT
LDRHI R14,modeflags
ASSERT ModeFlag_DataFormatSub_RGB > 8
ANDHI R14,R14,#ModeFlag_DataFormatSub_RGB
ORRHI R5,R14,R5 ; force table creation for RGB (but not BGR) 32bpp
ASSERT ModeFlag_DataFormatSub_Alpha > 8
ANDHI R14,R14,#ModeFlag_DataFormatSub_RGB+ModeFlag_DataFormatSub_Alpha
ORRHI R5,R14,R5 ; force table creation for non-BGR 32bpp
LDR R2,ttt_activeset_at
TEQ R2,#0
......
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