diff --git a/src/CRC.cpp b/src/CRC.cpp index d7df9dbd..fb9c91a1 100644 --- a/src/CRC.cpp +++ b/src/CRC.cpp @@ -1,4 +1,4 @@ -#include "Types.h" +#include "CRC.h" #define CRC32_POLYNOMIAL 0x04C11DB7 @@ -58,25 +58,3 @@ u32 CRC_CalculatePalette(u32 crc, const void * buffer, u32 count ) return crc ^ orig; } - -u32 textureCRC(u8 * addr, u32 height, u32 stride) -{ - const u32 width = stride / 8; - const u32 line = stride % 8; - u64 crc = 0; - u64 twopixel_crc; - - u32 * pixelpos = (u32*)addr; - for (; height; height--) { - int col = 0; - for (u32 i = width; i; --i) { - twopixel_crc = i * ((u64)(pixelpos[1] & 0xFFFEFFFE) + (u64)(pixelpos[0] & 0xFFFEFFFE) + crc); - crc = (twopixel_crc >> 32) + twopixel_crc; - pixelpos += 2; - } - crc = (height * crc >> 32) + height * crc; - pixelpos = (u32*)((u8*)pixelpos + line); - } - - return crc&0xFFFFFFFF; -} diff --git a/src/CRC.h b/src/CRC.h index a9a818fc..14f304a5 100644 --- a/src/CRC.h +++ b/src/CRC.h @@ -5,5 +5,3 @@ void CRC_BuildTable(); // CRC32 u32 CRC_Calculate( u32 crc, const void *buffer, u32 count ); u32 CRC_CalculatePalette( u32 crc, const void *buffer, u32 count ); -// Fast checksum calculation from Glide64 -u32 textureCRC(u8 * addr, u32 height, u32 stride); diff --git a/src/CRC_OPT.cpp b/src/CRC_OPT.cpp index 3a778ad5..1e3eff59 100644 --- a/src/CRC_OPT.cpp +++ b/src/CRC_OPT.cpp @@ -1,4 +1,4 @@ -#include "Types.h" +#include "CRC.h" void CRC_BuildTable() {