ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GFX3D: 

- Fix bug where 4x4 compressed textures in Mode 2 would mix the incorrect colors. (Regression from r5128.)
- Do some minor code cleanup.
This commit is contained in:
rogerman 2015-03-25 03:48:15 +00:00
parent 59d33fddb7
commit 3a747f85ce
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
desmume/src/texcache.cpp
View File

@ -549,15 +549,14 @@ public:
case 1: case 1:
#ifdef LOCAL_BE #ifdef LOCAL_BE
tmp_col[2] = ( (((tmp_col[0]&0xFF000000)>>1)+((tmp_col[1]&0xFF000000)>>1)) & 0xFF000000 ) | tmp_col[2] = ( (((tmp_col[0] & 0xFF000000) >> 1)+((tmp_col[1] & 0xFF000000) >> 1)) & 0xFF000000 ) |
( ((tmp_col[0]&0x00FF0000)+(tmp_col[1]&0x00FF0000))>>1 ) | ( (((tmp_col[0] & 0x00FF0000) + (tmp_col[1] & 0x00FF0000)) >> 1) & 0x00FF0000 ) |
( ((tmp_col[0]&0x0000FF00)+(tmp_col[1]&0x0000FF00))>>1 ) | ( (((tmp_col[0] & 0x0000FF00) + (tmp_col[1] & 0x0000FF00)) >> 1) & 0x0000FF00 ) |
0x000000FF; 0x000000FF;
tmp_col[3] = 0xFFFFFF00; tmp_col[3] = 0xFFFFFF00;
#else #else
tmp_col[2] = ( ((tmp_col[0]&0x000000FF)+(tmp_col[1]&0x000000FF))>>1 ) | tmp_col[2] = ( (((tmp_col[0] & 0x00FF00FF) + (tmp_col[1] & 0x00FF00FF)) >> 1) & 0x00FF00FF ) |
( ((tmp_col[0]&0x0000FF00)+(tmp_col[1]&0x0000FF00))>>1 ) | ( (((tmp_col[0] & 0x0000FF00) + (tmp_col[1] & 0x0000FF00)) >> 1) & 0x0000FF00 ) |
( ((tmp_col[0]&0x00FF0000)+(tmp_col[1]&0x00FF0000))>>1 ) |
0xFF000000; 0xFF000000;
tmp_col[3] = 0x00FFFFFF; tmp_col[3] = 0x00FFFFFF;
#endif #endif
@ -601,18 +600,18 @@ public:
if(TEXFORMAT==TexFormat_15bpp) if(TEXFORMAT==TexFormat_15bpp)
{ {
for(int i=0;i<4;i++) for (size_t i = 0; i < 4; i++)
{ {
tmp_col[i] >>= 2;
tmp_col[i] &= 0x3F3F3F3F;
#ifdef LOCAL_BE #ifdef LOCAL_BE
u32 a = tmp_col[i] & 0x000000FF; const u32 a = (tmp_col[i] >> 3) & 0x0000001F;
tmp_col[i] &= 0xFFFFFF00; tmp_col[i] >>= 2;
tmp_col[i] |= (a>>1); tmp_col[i] &= 0x3F3F3F00;
tmp_col[i] |= a;
#else #else
u32 a = tmp_col[i]>>24; const u32 a = (tmp_col[i] >> 3) & 0x1F000000;
tmp_col[i] &= 0x00FFFFFF; tmp_col[i] >>= 2;
tmp_col[i] |= (a>>1)<<24; tmp_col[i] &= 0x003F3F3F;
tmp_col[i] |= a;
#endif #endif
} }
} }
@ -620,23 +619,19 @@ public:
//TODO - this could be more precise for 32bpp mode (run it through the color separation table) //TODO - this could be more precise for 32bpp mode (run it through the color separation table)
//set all 16 texels //set all 16 texels
for (int sy = 0; sy < 4; sy++) for (size_t sy = 0; sy < 4; sy++)
{ {
// Texture offset // Texture offset
u32 currentPos = (x<<2) + tmpPos[sy]; u32 currentPos = (x<<2) + tmpPos[sy];
u8 currRow = (u8)((currBlock>>(sy<<3))&0xFF); u8 currRow = (u8)((currBlock>>(sy<<3))&0xFF);
dwdst[currentPos] = tmp_col[currRow&3]; dwdst[currentPos ] = tmp_col[ currRow &3];
dwdst[currentPos+1] = tmp_col[(currRow>>2)&3]; dwdst[currentPos+1] = tmp_col[(currRow>>2)&3];
dwdst[currentPos+2] = tmp_col[(currRow>>4)&3]; dwdst[currentPos+2] = tmp_col[(currRow>>4)&3];
dwdst[currentPos+3] = tmp_col[(currRow>>6)&3]; dwdst[currentPos+3] = tmp_col[(currRow>>6)&3];
} }
} }
} }
break; break;
} }
case TEXMODE_A5I3: case TEXMODE_A5I3: