r9070 update taking shadow/highlight into account, fixes mametesters bug 03644

This commit is contained in:
Michaël Banaan Ananas 2010-05-09 23:06:33 +00:00
parent 0b943660b5
commit 68bfc99c13

View File

@ -255,22 +255,20 @@ do \
if (entry != DRAWMODE_NONE) \ if (entry != DRAWMODE_NONE) \
{ \ { \
UINT8 pridata = (PRIORITY); \ UINT8 pridata = (PRIORITY); \
if (((1 << (pridata & 0x1f)) & pmask) == 0) \
{ \
if (entry == DRAWMODE_SOURCE) \ if (entry == DRAWMODE_SOURCE) \
{ \ { \
if (((1 << (pridata & 0x1f)) & pmask) == 0) \
(DEST) = paldata[srcdata]; \ (DEST) = paldata[srcdata]; \
(PRIORITY) = 31; \ else if (pridata & 0x80) \
(DEST) = shadowtable[paldata[srcdata]]; /* reapply */ \
(PRIORITY) = pridata | 0x1f; \
} \ } \
else if ((pridata & 0x80) == 0) \ else if (((pridata & 0x80) | ((1 << (pridata & 0x1f)) & pmask)) == 0) \
{ \ { \
(DEST) = shadowtable[DEST]; \ (DEST) = shadowtable[DEST]; \
(PRIORITY) = pridata | 0x80; \ (PRIORITY) = 0x9f; \
} \ } \
} \ } \
else if (entry == DRAWMODE_SOURCE) \
(PRIORITY) = 31; \
} \
} \ } \
while (0) \ while (0) \
@ -282,22 +280,20 @@ do \
if (entry != DRAWMODE_NONE) \ if (entry != DRAWMODE_NONE) \
{ \ { \
UINT8 pridata = (PRIORITY); \ UINT8 pridata = (PRIORITY); \
if (((1 << (pridata & 0x1f)) & pmask) == 0) \
{ \
if (entry == DRAWMODE_SOURCE) \ if (entry == DRAWMODE_SOURCE) \
{ \ { \
if (((1 << (pridata & 0x1f)) & pmask) == 0) \
(DEST) = paldata[srcdata]; \ (DEST) = paldata[srcdata]; \
(PRIORITY) = 31; \ else if (pridata & 0x80) \
(DEST) = shadowtable[rgb_to_rgb15(paldata[srcdata])]; \
(PRIORITY) = pridata | 0x1f; \
} \ } \
else if ((pridata & 0x80) == 0) \ else if (((pridata & 0x80) | ((1 << (pridata & 0x1f)) & pmask)) == 0) \
{ \ { \
(DEST) = shadowtable[rgb_to_rgb15(DEST)]; \ (DEST) = shadowtable[rgb_to_rgb15(DEST)]; \
(PRIORITY) = pridata | 0x80; \ (PRIORITY) = 0x9f; \
} \ } \
} \ } \
else if (entry == DRAWMODE_SOURCE) \
(PRIORITY) = 31; \
} \
} \ } \
while (0) \ while (0) \