mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 12:12:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Apply Sprow's fix for bug #2336.

Browse Source 
I've not been able to test this, but since Sprow was also the original
reporter, it seems safe to apply.

Bug #2336: Colours rendered incorrectly in 4k and 64k colour modes.
This commit is contained in:
Robert Sprowson 2015-10-31 18:30:35 +00:00 committed by Michael Drake
parent c22706b904
commit 469147b593
1 changed files with 103 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
riscos/buffer.c
View File

@ -38,6 +38,11 @@
#define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)" #define BUFFER_EXCLUSIVE_USER_REDRAW "Only support pure user redraw (faster)"
//#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct" //#define BUFFER_EMULATE_32BPP "Redirect to a 32bpp sprite and plot with Tinct"
/** Absent from OSLib
*/
#define osspriteop_TYPEEXPANSION ((osspriteop_mode_word) 0xFu)
#define osspriteop_TYPE16BPP4K ((osspriteop_mode_word) 0x10u)
static void ro_gui_buffer_free(void); static void ro_gui_buffer_free(void);
@ -151,28 +156,117 @@ void ro_gui_buffer_open(wimp_draw *redraw)
static const ns_os_vdu_var_list vars = { static const ns_os_vdu_var_list vars = {
os_MODEVAR_LOG2_BPP, os_MODEVAR_LOG2_BPP,
{ {
os_MODEVAR_MODE_FLAGS,
os_MODEVAR_NCOLOUR,
os_MODEVAR_XEIG_FACTOR, os_MODEVAR_XEIG_FACTOR,
os_MODEVAR_YEIG_FACTOR, os_MODEVAR_YEIG_FACTOR,
os_VDUVAR_END_LIST os_VDUVAR_END_LIST
} }
}; };
struct {
int log2bpp;
int flags;
int ncolour;
int xeig, yeig; int xeig, yeig;
int vals[4]; } vals;
int type; int type;
error = xos_read_vdu_variables(PTR_OS_VDU_VAR_LIST(&vars), vals); error = xos_read_vdu_variables(PTR_OS_VDU_VAR_LIST(&vars), (int *)&vals);
if (error) { if (error) {
LOG("Error reading mode properties '%s'", error->errmess); LOG("Error reading mode properties '%s'", error->errmess);
ro_gui_buffer_free(); ro_gui_buffer_free();
return; return;
} }
type = 1 + vals[0]; switch (vals.ncolour) {
xeig = vals[1]; case 1:
yeig = vals[2]; case 3:
case 15:
mode = (os_mode)((type << 27) | ((180 >> yeig) << 14) | case 63:
((180 >> xeig) << 1) | 1); case 255:
/* Paletted modes are pixel packing order agnostic */
type = 1 + vals.log2bpp;
mode = (os_mode)((type << osspriteop_TYPE_SHIFT) |
osspriteop_NEW_STYLE |
((180 >> vals.yeig) << osspriteop_YRES_SHIFT) |
((180 >> vals.xeig) << osspriteop_XRES_SHIFT));
break;
case 4095:
/* 16bpp 4k colours */
type = osspriteop_TYPE16BPP4K;
mode = (os_mode)((osspriteop_TYPEEXPANSION << osspriteop_TYPE_SHIFT) |
osspriteop_NEW_STYLE |
(vals.yeig << 6) |
(vals.xeig << 4) |
(type << 20) |
(vals.flags & 0xFF00));
break;
case 65535:
switch ((vals.flags & 0x3000) >> os_MODE_FLAG_DATA_FORMAT_SHIFT) {
case os_MODE_FLAG_DATA_FORMAT_RGB:
if (vals.flags & 0xC000) {
/* Non VIDC packing order */
if (vals.flags & os_MODE_FLAG_FULL_PALETTE)
type = osspriteop_TYPE16BPP64K;
else
type = osspriteop_TYPE16BPP;
mode = (os_mode)((osspriteop_TYPEEXPANSION << osspriteop_TYPE_SHIFT) |
osspriteop_NEW_STYLE |
(vals.yeig << 6) |
(vals.xeig << 4) |
(type << 20) |
(vals.flags & 0xFF00));
} else {
/* VIDC packing order */
if (vals.flags & os_MODE_FLAG_FULL_PALETTE)
type = osspriteop_TYPE16BPP64K;
else
type = osspriteop_TYPE16BPP;
mode = (os_mode)((type << osspriteop_TYPE_SHIFT) |
osspriteop_NEW_STYLE |
((180 >> vals.yeig) << osspriteop_YRES_SHIFT) |
((180 >> vals.xeig) << osspriteop_XRES_SHIFT));
}
break;
default:
LOG("Unhandled 16bpp format from flags %d", vals.flags);
ro_gui_buffer_free();
return;
}
break;
case -1:
/* 16M colours */
switch ((vals.flags & 0x3000) >> os_MODE_FLAG_DATA_FORMAT_SHIFT) {
case os_MODE_FLAG_DATA_FORMAT_RGB:
if (vals.flags & 0xC000) {
/* Non VIDC packing order */
type = osspriteop_TYPE32BPP;
mode = (os_mode)((osspriteop_TYPEEXPANSION << osspriteop_TYPE_SHIFT) |
osspriteop_NEW_STYLE |
(vals.yeig << 6) |
(vals.xeig << 4) |
(type << 20) |
(vals.flags & 0xFF00));
} else {
/* VIDC packing order */
type = osspriteop_TYPE32BPP;
mode = (os_mode)((type << osspriteop_TYPE_SHIFT) |
osspriteop_NEW_STYLE |
((180 >> vals.yeig) << osspriteop_YRES_SHIFT) |
((180 >> vals.xeig) << osspriteop_XRES_SHIFT));
}
break;
default:
LOG("Unhandled 32bpp data format from flags %d", vals.flags);
ro_gui_buffer_free();
return;
}
break;
default:
LOG("Unhandled NCOLOUR value %d", vals.ncolour);
ro_gui_buffer_free();
return;
}
} }
#endif #endif