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

Fix variable shadowing in OGLRender by reusing u32 *dwdst 

instead of declaring a u16 *dst.
This commit is contained in:
riccardom 2008-11-17 20:17:10 +00:00
parent 876a911a0d
commit 33b739ad9e
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
desmume/src/OGLRender.cpp
View File

@ -654,7 +654,6 @@ static void setTexture(unsigned int format, unsigned int texpal)
unsigned short * slot1; unsigned short * slot1;
unsigned int * map = (unsigned int *)adr; unsigned int * map = (unsigned int *)adr;
unsigned int d = 0; unsigned int d = 0;
unsigned int * dst = (unsigned int *)texMAP;
if ( (texcache[i].frm & 0xc000) == 0x8000) if ( (texcache[i].frm & 0xc000) == 0x8000)
// texel are in slot 2 // texel are in slot 2
slot1=(unsigned short*)&ARM9Mem.textureSlotAddr[1][((texcache[i].frm&0x3FFF)<<2)+0x010000]; slot1=(unsigned short*)&ARM9Mem.textureSlotAddr[1][((texcache[i].frm&0x3FFF)<<2)+0x010000];
@ -727,16 +726,13 @@ static void setTexture(unsigned int format, unsigned int texpal)
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);
dst[currentPos] = tmp_col[currRow&3]; dwdst[currentPos] = tmp_col[currRow&3];
dst[currentPos+1] = tmp_col[(currRow>>2)&3]; dwdst[currentPos+1] = tmp_col[(currRow>>2)&3];
dst[currentPos+2] = tmp_col[(currRow>>4)&3]; dwdst[currentPos+2] = tmp_col[(currRow>>4)&3];
dst[currentPos+3] = tmp_col[(currRow>>6)&3]; dwdst[currentPos+3] = tmp_col[(currRow>>6)&3];
if(dead) { if(dead) {
dst[currentPos] = 0; memset(dwdst, 0, sizeof(dwdst[0]) * 4);
dst[currentPos+1] = 0;
dst[currentPos+2] = 0;
dst[currentPos+3] = 0;
} }
txt_slot_current_size-=4;; txt_slot_current_size-=4;;
@ -770,16 +766,14 @@ static void setTexture(unsigned int format, unsigned int texpal)
case 7: //16bpp case 7: //16bpp
{ {
unsigned short * map = ((unsigned short *)adr); unsigned short * map = ((unsigned short *)adr);
unsigned int * dst = (unsigned int *)texMAP;
pal = (unsigned short *)(ARM9Mem.texPalSlot[0] + (texturePalette<<4)); pal = (unsigned short *)(ARM9Mem.texPalSlot[0] + (texturePalette<<4));
for(x = 0; x < imageSize; ++x) for(x = 0; x < imageSize; ++x)
{ {
u16 c = map[x]; u16 c = map[x];
int alpha = ((c&0x8000)?255:0); int alpha = ((c&0x8000)?255:0);
*dst = RGB15TO32(c&0x7FFF,alpha); *dwdst++ = RGB15TO32(c&0x7FFF,alpha);
dst++;
txt_slot_current_size-=2;; txt_slot_current_size-=2;;
if (txt_slot_current_size<=0) if (txt_slot_current_size<=0)
{ {