MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Replace Adler32 by more faster textureCRC from Glide64.

Browse Source 
textureCRC is good enough to calculate checksum of frame buffer.
This commit is contained in:
Sergey Lipskiy 2015-04-09 20:33:40 +06:00
parent 7914c415ad
commit 6fa0204709
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CRC.cpp
View File

@ -59,28 +59,24 @@ u32 CRC_CalculatePalette(u32 crc, const void * buffer, u32 count )
return crc ^ orig; return crc ^ orig;
} }
u32 Adler32(u32 crc, const void *buffer, u32 count) u32 textureCRC(u8 * addr, u32 height, u32 stride)
{ {
register u32 s1 = crc & 0xFFFF; const u32 width = stride / 8;
register u32 s2 = (crc >> 16) & 0xFFFF; const u32 line = stride % 8;
int k; u64 crc = 0;
const u8 *Buffer = (const u8*)buffer; u64 twopixel_crc;
if (Buffer == NULL) u32 * pixelpos = (u32*)addr;
return 0; for (; height; height--) {
int col = 0;
while (count > 0) { for (u32 i = width; i; --i) {
/* 5552 is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ twopixel_crc = i * ((u64)(pixelpos[1] & 0xFFFEFFFE) + (u64)(pixelpos[0] & 0xFFFEFFFE) + crc);
k = (count < 5552 ? count : 5552); crc = (twopixel_crc >> 32) + twopixel_crc;
count -= k; pixelpos += 2;
while (k--) {
s1 += *Buffer++;
s2 += s1;
} }
/* 65521 is the largest prime smaller than 65536 */ crc = (height * crc >> 32) + height * crc;
s1 %= 65521; pixelpos = (u32*)((u8*)pixelpos + line);
s2 %= 65521;
} }
return (s2 << 16) | s1; return crc&0xFFFFFFFF;
} }

4
CRC.h
View File

@ -2,6 +2,8 @@
void CRC_BuildTable(); void CRC_BuildTable();
// CRC32
u32 CRC_Calculate( u32 crc, const void *buffer, u32 count ); u32 CRC_Calculate( u32 crc, const void *buffer, u32 count );
u32 CRC_CalculatePalette( u32 crc, const void *buffer, u32 count ); u32 CRC_CalculatePalette( u32 crc, const void *buffer, u32 count );
u32 Adler32(u32 crc, const void *buffer, u32 count); // Fast checksum calculation from Glide64
u32 textureCRC(u8 * addr, u32 height, u32 stride);

5
FrameBuffer.cpp
View File

@ -811,7 +811,8 @@ void FrameBufferToRDRAM::_copyWhite(FrameBuffer * _pBuffer)
} }
} }
} }
_pBuffer->m_RdramCrc = Adler32(0, RDRAM + _pBuffer->m_startAddress, (VI.width*VI.height) << _pBuffer->m_size >> 1); _pBuffer->m_RdramCrc = textureCRC(RDRAM + _pBuffer->m_startAddress, _pBuffer->m_height, _pBuffer->m_width << _pBuffer->m_size >> 1);
_pBuffer->m_cleared = false; _pBuffer->m_cleared = false;
} }
@ -880,7 +881,7 @@ void FrameBufferToRDRAM::CopyToRDRAM(u32 _address)
} }
} }
} }
pBuffer->m_RdramCrc = Adler32(0, RDRAM + _address, (VI.width*VI.height) << pBuffer->m_size >> 1); pBuffer->m_RdramCrc = textureCRC(RDRAM + pBuffer->m_startAddress, pBuffer->m_height, pBuffer->m_width << pBuffer->m_size >> 1);
pBuffer->m_cleared = false; pBuffer->m_cleared = false;
#ifndef GLES2 #ifndef GLES2
glUnmapBuffer(GL_PIXEL_PACK_BUFFER); glUnmapBuffer(GL_PIXEL_PACK_BUFFER);

2
gDP.cpp
View File

@ -427,7 +427,7 @@ bool CheckForFrameBufferTexture(u32 _address, u32 _bytes)
else else
frameBufferList().removeBuffer(pBuffer->m_startAddress); frameBufferList().removeBuffer(pBuffer->m_startAddress);
} else if (pBuffer->m_RdramCrc != 0) { } else if (pBuffer->m_RdramCrc != 0) {
const u32 crc = Adler32(0, RDRAM + pBuffer->m_startAddress, (VI.width*VI.height) << pBuffer->m_size >> 1); const u32 crc = textureCRC(RDRAM + pBuffer->m_startAddress, pBuffer->m_height, pBuffer->m_width << pBuffer->m_size >> 1);
bRes = (pBuffer->m_RdramCrc == crc); bRes = (pBuffer->m_RdramCrc == crc);
if (bRes) if (bRes)
pBuffer->m_validityChecked = RSP.DList; pBuffer->m_validityChecked = RSP.DList;