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

Remove CRC_OPT since it does not provide good enough checksum.

Browse Source
This commit is contained in:
Sergey Lipskiy 2016-10-18 21:00:12 +07:00
parent afb7c8ccd1
commit 48c8c25226
12 changed files with 12 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projects/cmake/Readme.txt
View File

@ -4,8 +4,7 @@ cmake [-DCMAKE_BUILD_TYPE=Debug] [-DVEC4_OPT=On] [-DCRC_OPT=On] [-DNEON_OPT=On]
-DCMAKE_BUILD_TYPE=Debug - optional parameter, if you want debug build. Default buid type is Release
-DVEC4_OPT=On - optional parameter. set it if you want to enable additional VEC4 optimization (can cause additional bugs).
-DCRC_OPT=On - optional parameter. set it if you want to enable additional CRC optimization (can cause additional bugs).
-DCRC_ARMV8=On - optional parameter. set it if you want to enable armv8 hardware CRC. It will be ignored if -DCRC_OPT=On.
-DCRC_ARMV8=On - optional parameter. set it if you want to enable armv8 hardware CRC.
-DNEON_OPT=On - optional parameter. set it if you want to enable additional ARM NEON optimization (can cause additional bugs).
-DNOHQ=On - build without realtime texture enhancer library (GLideNHQ).
-DUSE_UNIFORMBLOCK=On - Use uniform blocks in shaders. May help to improve performance. Not supported by GLES2 hardware.

1
projects/msvc12/GLideN64.vcxproj
View File

@ -274,7 +274,6 @@
<ClCompile Include="..\..\src\common\GLFunctions.cpp" />
<ClCompile Include="..\..\src\Config.cpp" />
<ClCompile Include="..\..\src\convert.cpp" />
<ClCompile Include="..\..\src\CRC.cpp" />
<ClCompile Include="..\..\src\CRC32.cpp" />
<ClCompile Include="..\..\src\DepthBuffer.cpp" />
<ClCompile Include="..\..\src\DepthBufferRender\ClipPolygon.cpp" />

3
projects/msvc12/GLideN64.vcxproj.filters
View File

@ -59,9 +59,6 @@
<ClCompile Include="..\..\src\Combiner.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CRC.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\DepthBuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>

19
src/CMakeLists.txt
View File

@ -12,7 +12,6 @@ set(GLideN64_SOURCES
CommonPluginAPI.cpp
Config.cpp
convert.cpp
CRC.cpp
CRC32.cpp
DepthBuffer.cpp
F3D.cpp
@ -186,20 +185,14 @@ if(VEC4_OPT)
)
endif(VEC4_OPT)
if(CRC_OPT OR CRC_ARMV8)
if(CRC_ARMV8)
list(REMOVE_ITEM GLideN64_SOURCES
CRC.cpp
CRC32.cpp
)
if(CRC_OPT)
list(APPEND GLideN64_SOURCES
CRC_OPT.cpp
)
elseif(CRC_ARMV8)
list(APPEND GLideN64_SOURCES
CRC_ARMV8.cpp
)
endif(CRC_OPT)
endif(CRC_OPT OR CRC_ARMV8)
list(APPEND GLideN64_SOURCES
CRC32_ARMV8.cpp
)
endif(CRC_ARMV8)
if(NEON_OPT)
add_definitions(

22
src/CRC.cpp
View File

@ -1,22 +0,0 @@
#include "CRC.h"
#include "CRC32.h"
void CRC_Init()
{
CRC32_BuildTable();
}
u32 CRC_Calculate_Strict( u32 crc, const void * buffer, u32 count )
{
return CRC32_Calculate(crc, buffer, count);
}
u32 CRC_Calculate( u32 crc, const void * buffer, u32 count )
{
return CRC32_Calculate(crc, buffer, count);
}
u32 CRC_CalculatePalette(u32 crc, const void * buffer, u32 count )
{
return CRC32_CalculatePalette(crc, buffer, count);
}

2
src/CRC.h
View File

@ -2,7 +2,5 @@
void CRC_Init();
// Strict checksum calculation. usually CRC32
u32 CRC_Calculate_Strict( 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 );

8
src/CRC32.cpp
View File

@ -1,4 +1,4 @@
#include "CRC32.h"
#include "CRC.h"
#define CRC32_POLYNOMIAL 0x04C11DB7
@ -19,7 +19,7 @@ u32 Reflect( u32 ref, char ch )
return value;
}
void CRC32_BuildTable()
void CRC_Init()
{
u32 crc;
@ -32,7 +32,7 @@ void CRC32_BuildTable()
}
}
u32 CRC32_Calculate( u32 crc, const void * buffer, u32 count )
u32 CRC_Calculate( u32 crc, const void * buffer, u32 count )
{
u8 *p;
u32 orig = crc;
@ -44,7 +44,7 @@ u32 CRC32_Calculate( u32 crc, const void * buffer, u32 count )
return crc ^ orig;
}
u32 CRC32_CalculatePalette(u32 crc, const void * buffer, u32 count )
u32 CRC_CalculatePalette(u32 crc, const void * buffer, u32 count )
{
u8 *p;
u32 orig = crc;

6
src/CRC32.h
View File

@ -1,6 +0,0 @@
#include "Types.h"
void CRC32_BuildTable();
u32 CRC32_Calculate( u32 crc, const void *buffer, u32 count );
u32 CRC32_CalculatePalette( u32 crc, const void *buffer, u32 count );

0
src/CRC_ARMV8.cpp → src/CRC32_ARMV8.cpp
View File

48
src/CRC_OPT.cpp
View File

@ -1,48 +0,0 @@
#include "CRC.h"
#include "CRC32.h"
void CRC_Init()
{
CRC32_BuildTable();
}
u32 CRC_Calculate_Strict( u32 crc, const void * buffer, u32 count )
{
return CRC32_Calculate(crc, buffer, count);
}
u32 CRC_Calculate( u32 crc, const void * buffer, u32 count )
{
unsigned int i;
u32 *data = (u32 *) buffer;
count /= 4;
for(i = 0; i < count; ++i) {
crc += data[i];
crc += (crc << 10);
crc ^= (crc >> 6);
}
crc += (crc << 3);
crc ^= (crc >> 11);
crc += (crc << 15);
return crc;
}
u32 CRC_CalculatePalette( u32 crc, const void * buffer, u32 count )
{
unsigned int i;
u16 *data = (u16 *) buffer;
count /= 4;
for(i = 0; i < count; ++i) {
crc += data[i << 2];
crc += (crc << 10);
crc ^= (crc >> 6);
}
crc += (crc << 3);
crc ^= (crc >> 11);
crc += (crc << 15);
return crc;
}

2
src/GBI.cpp
View File

@ -241,7 +241,7 @@ void GBIInfo::loadMicrocode(u32 uc_start, u32 uc_dstart, u16 uc_dsize)
current.type = NONE;
// See if we can identify it by CRC
const u32 uc_crc = CRC_Calculate_Strict( 0xFFFFFFFF, &RDRAM[uc_start & 0x1FFFFFFF], 4096 );
const u32 uc_crc = CRC_Calculate( 0xFFFFFFFF, &RDRAM[uc_start & 0x1FFFFFFF], 4096 );
const u32 numSpecialMicrocodes = sizeof(specialMicrocodes) / sizeof(SpecialMicrocodeInfo);
for (u32 i = 0; i < numSpecialMicrocodes; ++i) {
if (uc_crc == specialMicrocodes[i].crc) {

1
src/mupen64plus-video-gliden64.mk
View File

@ -29,7 +29,6 @@ MY_LOCAL_SRC_FILES := \
$(SRCDIR)/Config.cpp \
$(SRCDIR)/convert.cpp \
$(SRCDIR)/CRC32.cpp \
$(SRCDIR)/CRC_OPT.cpp \
$(SRCDIR)/DepthBuffer.cpp \
$(SRCDIR)/F3D.cpp \
$(SRCDIR)/F3DDKR.cpp \