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

[Glide64] These buffers can overlap, so memmove() must be used instead of memcp… 

48e20bc799 (diff-4a633600241920557d6c8b6d96dfb363R298)
This commit is contained in:
zilmar 2015-10-11 20:54:30 +11:00
parent 1dd25b2063
commit 7d43d10dd5
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Glide64/TexBuffer.cpp
View File

@ -293,7 +293,7 @@ int OpenTextureBuffer(COLOR_IMAGE & cimage)
grRenderBuffer( GR_BUFFER_BACKBUFFER ); grRenderBuffer( GR_BUFFER_BACKBUFFER );
rdp.texbufs[i].count--; rdp.texbufs[i].count--;
if (j < rdp.texbufs[i].count) if (j < rdp.texbufs[i].count)
memcpy(&(rdp.texbufs[i].images[j]), &(rdp.texbufs[i].images[j+1]), sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[i].count-j)); memmove(&(rdp.texbufs[i].images[j]), &(rdp.texbufs[i].images[j+1]), sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[i].count-j));
} }
} }
} }
@ -705,12 +705,7 @@ int FindTextureBuffer(wxUint32 addr, wxUint16 width)
if (rdp.tbuff_tex->crc == 0) if (rdp.tbuff_tex->crc == 0)
{ {
rdp.tbuff_tex->crc = CalcCRC(rdp.tbuff_tex); rdp.tbuff_tex->crc = CalcCRC(rdp.tbuff_tex);
bCorrect = bCorrect = (width == 1) || (rdp.tbuff_tex->width == width) || ((rdp.tbuff_tex->width > 320) && (rdp.tbuff_tex->width == (wxUint32)width*2));
(width == 1)
|| (rdp.tbuff_tex->width == width)
|| ( (rdp.tbuff_tex->width > 320)
&& (rdp.tbuff_tex->width == (wxUint32)width*2)
);
} }
else else
bCorrect = rdp.tbuff_tex->crc == CalcCRC(rdp.tbuff_tex); bCorrect = rdp.tbuff_tex->crc == CalcCRC(rdp.tbuff_tex);
@ -727,7 +722,7 @@ int FindTextureBuffer(wxUint32 addr, wxUint16 width)
{ {
rdp.texbufs[index].count--; rdp.texbufs[index].count--;
if (j < rdp.texbufs[index].count) if (j < rdp.texbufs[index].count)
memcpy(&(rdp.texbufs[index].images[j]), &(rdp.texbufs[index].images[j+1]), sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[index].count-j)); memmove(&(rdp.texbufs[index].images[j]), &(rdp.texbufs[index].images[j+1]), sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[index].count-j));
} }
} }
} }