Skip to content

Commit a00b89b

Browse files
author
nitrocaster
committed
Use xrCore crc32 instead of boost crc (#96).
1 parent 34ad8a8 commit a00b89b

File tree

8 files changed

+26
-105
lines changed

8 files changed

+26
-105
lines changed

‎src/Layers/xrRenderPC_R1/FStaticRender.cpp‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,6 @@ void CRender::DumpStatistics(IGameFont &font, IPerformanceAlert *alert)
660660

661661
#pragma comment(lib,"d3dx9.lib")
662662

663-
#include <boost/crc.hpp>
664-
665663
static inline bool match_shader_id ( LPCSTR const debug_shader_id, LPCSTR const full_shader_id, FS_FileSet const& file_set, string_path& result );
666664

667665
//--------------------------------------------------------------------------------------------------------------
@@ -880,16 +878,10 @@ HRESULT CRender::shader_compile (
880878
IReader* file = FS.r_open(file_name);
881879
if (file->length()>4)
882880
{
883-
u32 crc = 0;
884-
crc = file->r_u32();
885-
886-
boost::crc_32_type processor;
887-
processor.process_block ( file->pointer(), ((char*)file->pointer()) + file->elapsed() );
888-
u32 const real_crc = processor.checksum( );
889-
890-
if ( real_crc == crc ) {
891-
_result = create_shader(pTarget, (DWORD*)file->pointer(), file->elapsed(), file_name, result, o.disasm);
892-
}
881+
u32 crc = file->r_u32();
882+
u32 crcComp = crc32(file->pointer(), file->elapsed());
883+
if (crcComp==crc)
884+
_result = create_shader(pTarget, (DWORD*)file->pointer(), file->elapsed(), file_name, result, o.disasm);
893885
}
894886
file->close();
895887
}
@@ -905,11 +897,7 @@ HRESULT CRender::shader_compile (
905897
_result = D3DXCompileShader((LPCSTR)pSrcData,SrcDataLen,defines,pInclude,pFunctionName,pTarget,Flags|D3DXSHADER_USE_LEGACY_D3DX9_31_DLL,&pShaderBuf,&pErrorBuf,&pConstants);
906898
if (SUCCEEDED(_result)) {
907899
IWriter* file = FS.w_open(file_name);
908-
909-
boost::crc_32_type processor;
910-
processor.process_block ( pShaderBuf->GetBufferPointer(), ((char*)pShaderBuf->GetBufferPointer()) + pShaderBuf->GetBufferSize() );
911-
u32 const crc = processor.checksum( );
912-
900+
u32 crc = crc32(pShaderBuf->GetBufferPointer(), pShaderBuf->GetBufferSize());
913901
file->w_u32 (crc);
914902
file->w ( pShaderBuf->GetBufferPointer(), (u32)pShaderBuf->GetBufferSize());
915903
FS.w_close (file);

‎src/Layers/xrRenderPC_R2/r2.cpp‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,6 @@ static HRESULT create_shader (
625625
return _result;
626626
}
627627

628-
#include <boost/crc.hpp>
629-
630628
static inline bool match_shader_id ( LPCSTR const debug_shader_id, LPCSTR const full_shader_id, FS_FileSet const& file_set, string_path& result );
631629

632630
class includer : public ID3DXInclude
@@ -997,22 +995,10 @@ HRESULT CRender::shader_compile (
997995
IReader* file = FS.r_open(file_name);
998996
if (file->length()>4)
999997
{
1000-
u32 crc = 0;
1001-
crc = file->r_u32();
1002-
1003-
boost::crc_32_type processor;
1004-
processor.process_block ( file->pointer(), ((char*)file->pointer()) + file->elapsed() );
1005-
u32 const real_crc = processor.checksum( );
1006-
1007-
if ( real_crc == crc ) {
1008-
_result = create_shader(pTarget, (DWORD*)file->pointer(), file->elapsed(), file_name, result, o.disasm);
1009-
//if ( !SUCCEEDED(_result) ) {
1010-
// Msg ("! create shader failed");
1011-
//}
1012-
//else {
1013-
// Msg ( "create shaders succeeded" );
1014-
//}
1015-
}
998+
u32 crc = file->r_u32();
999+
u32 crcComp = crc32(file->pointer(), file->elapsed());
1000+
if (crcComp==crc)
1001+
_result = create_shader(pTarget, (DWORD*)file->pointer(), file->elapsed(), file_name, result, o.disasm);
10161002
}
10171003
file->close();
10181004
}
@@ -1035,11 +1021,7 @@ HRESULT CRender::shader_compile (
10351021
if (SUCCEEDED(_result)) {
10361022
// Msg ( "shader compilation succeeded" );
10371023
IWriter* file = FS.w_open(file_name);
1038-
1039-
boost::crc_32_type processor;
1040-
processor.process_block ( pShaderBuf->GetBufferPointer(), ((char*)pShaderBuf->GetBufferPointer()) + pShaderBuf->GetBufferSize() );
1041-
u32 const crc = processor.checksum( );
1042-
1024+
u32 crc = crc32(pShaderBuf->GetBufferPointer(), pShaderBuf->GetBufferSize());
10431025
file->w_u32 (crc);
10441026
file->w ( pShaderBuf->GetBufferPointer(), (u32)pShaderBuf->GetBufferSize());
10451027
FS.w_close (file);

‎src/Layers/xrRenderPC_R3/r3.cpp‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -870,8 +870,6 @@ class includer : public ID3DInclude
870870
}
871871
};
872872

873-
#include <boost/crc.hpp>
874-
875873
HRESULT CRender::shader_compile (
876874
LPCSTR name,
877875
DWORD const* pSrcData,
@@ -1351,16 +1349,10 @@ HRESULT CRender::shader_compile (
13511349
IReader* file = FS.r_open(file_name);
13521350
if (file->length()>4)
13531351
{
1354-
u32 crc = 0;
1355-
crc = file->r_u32();
1356-
1357-
boost::crc_32_type processor;
1358-
processor.process_block ( file->pointer(), ((char*)file->pointer()) + file->elapsed() );
1359-
u32 const real_crc = processor.checksum( );
1360-
1361-
if ( real_crc == crc ) {
1362-
_result = create_shader(pTarget, (DWORD*)file->pointer(), file->elapsed(), file_name, result, o.disasm);
1363-
}
1352+
u32 crc = file->r_u32();
1353+
u32 crcComp = crc32(file->pointer(), file->elapsed());
1354+
if (crcComp==crc)
1355+
_result = create_shader(pTarget, (DWORD*)file->pointer(), file->elapsed(), file_name, result, o.disasm);
13641356
}
13651357
file->close();
13661358
}
@@ -1386,11 +1378,7 @@ HRESULT CRender::shader_compile (
13861378
if (SUCCEEDED(_result))
13871379
{
13881380
IWriter* file = FS.w_open(file_name);
1389-
1390-
boost::crc_32_type processor;
1391-
processor.process_block ( pShaderBuf->GetBufferPointer(), ((char*)pShaderBuf->GetBufferPointer()) + pShaderBuf->GetBufferSize() );
1392-
u32 const crc = processor.checksum( );
1393-
1381+
u32 crc = crc32(pShaderBuf->GetBufferPointer(), pShaderBuf->GetBufferSize());
13941382
file->w_u32 (crc);
13951383
file->w (pShaderBuf->GetBufferPointer(), (u32)pShaderBuf->GetBufferSize());
13961384
FS.w_close (file);

‎src/Layers/xrRenderPC_R4/r4.cpp‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -972,8 +972,6 @@ class includer : public ID3DInclude
972972
}
973973
};
974974

975-
#include <boost/crc.hpp>
976-
977975
static inline bool match_shader_id ( LPCSTR const debug_shader_id, LPCSTR const full_shader_id, FS_FileSet const& file_set, string_path& result );
978976

979977
HRESULT CRender::shader_compile (
@@ -1489,16 +1487,10 @@ HRESULT CRender::shader_compile (
14891487
IReader* file = FS.r_open(file_name);
14901488
if (file->length()>4)
14911489
{
1492-
u32 crc = 0;
1493-
crc = file->r_u32();
1494-
1495-
boost::crc_32_type processor;
1496-
processor.process_block ( file->pointer(), ((char*)file->pointer()) + file->elapsed() );
1497-
u32 const real_crc = processor.checksum( );
1498-
1499-
if ( real_crc == crc ) {
1500-
_result = create_shader(pTarget, (DWORD*)file->pointer(), file->elapsed(), file_name, result, o.disasm);
1501-
}
1490+
u32 crc = file->r_u32();
1491+
u32 crcComp = crc32(file->pointer(), file->elapsed());
1492+
if (crcComp==crc)
1493+
_result = create_shader(pTarget, (DWORD*)file->pointer(), file->elapsed(), file_name, result, o.disasm);
15021494
}
15031495
file->close();
15041496
}
@@ -1523,11 +1515,7 @@ HRESULT CRender::shader_compile (
15231515
if (SUCCEEDED(_result))
15241516
{
15251517
IWriter* file = FS.w_open(file_name);
1526-
1527-
boost::crc_32_type processor;
1528-
processor.process_block ( pShaderBuf->GetBufferPointer(), ((char*)pShaderBuf->GetBufferPointer()) + pShaderBuf->GetBufferSize() );
1529-
u32 const crc = processor.checksum( );
1530-
1518+
u32 crc = crc32(pShaderBuf->GetBufferPointer(), pShaderBuf->GetBufferSize());
15311519
file->w_u32 (crc);
15321520
file->w (pShaderBuf->GetBufferPointer(), (u32)pShaderBuf->GetBufferSize());
15331521
FS.w_close (file);

‎src/xrCore/memory_allocation_stats.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#include "stdafx.h"
2+
#include "xrCore.h"
23

34
#ifdef DEBUG_MEMORY_MANAGER
45
# pragma warning(push)
56
# pragma warning(disable:4995)
67
# include <malloc.h>
78
# pragma warning(pop)
89

9-
# include <boost/crc.hpp>
10-
1110
extern void BuildStackTrace ();
1211

1312
extern char g_stackTrace[100][4096];
@@ -116,10 +115,7 @@ void save_stack_trace ()
116115
*--J = 0;
117116
}
118117

119-
boost::crc_32_type temp;
120-
temp.process_block (string,string + accumulator);
121-
u32 crc = temp.checksum();
122-
118+
u32 crc = crc32(string, accumulator);
123119
STATS::iterator I = stats.find(crc);
124120
STATS::iterator E = stats.end();
125121
for ( ; I != E; ++I)

‎src/xrEngine/main.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -836,8 +836,6 @@ int stack_overflow_exception_filter(int exception_code)
836836
return EXCEPTION_CONTINUE_SEARCH;
837837
}
838838

839-
#include <boost/crc.hpp>
840-
841839
int APIENTRY WinMain(HINSTANCE hInstance,
842840
HINSTANCE hPrevInstance,
843841
char* lpCmdLine,
@@ -852,9 +850,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
852850

853851
//u32 const& crc = *(u32*)buffer;
854852

855-
//boost::crc_32_type processor;
856-
//processor.process_block ( buffer + 4, buffer + file_size );
857-
//u32 const new_crc = processor.checksum( );
853+
//u32 const new_crc = crc32( buffer + 4, buffer + file_size );
858854
//VERIFY ( new_crc == crc );
859855

860856
//free (buffer);

‎src/xrGame/ai_obstacle.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include "xrAICore/Navigation/level_graph.h"
1313
#include "GameObject.h"
1414
#include "Include/xrRender/Kinematics.h"
15-
#include <boost/crc.hpp>
16-
1715
#include "xrCore/Animation/Bone.hpp"
1816

1917
#pragma warning(push)
@@ -262,10 +260,7 @@ void ai_obstacle::compute_impl ()
262260
m_crc = 0;
263261
return;
264262
}
265-
266-
boost::crc_32_type temp;
267-
temp.process_block (&*m_area.begin(),&*m_area.end());
268-
m_crc = temp.checksum();
263+
m_crc = crc32(&*m_area.begin(), m_area.size()*sizeof(m_area[0]));
269264
}
270265

271266
void ai_obstacle::on_move ()

‎src/xrNetServer/NET_Compressor.cpp‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
#include "NET_Common.h"
88
#include "NET_Compressor.h"
9-
10-
11-
12-
13-
149
#if NET_USE_COMPRESSION
1510

1611
# ifdef DEBUG
@@ -20,8 +15,6 @@
2015
# pragma warning(pop)
2116
# endif // DEBUG
2217

23-
# include <boost/crc.hpp>
24-
2518
# if NET_USE_LZO_COMPRESSION
2619
# define ENCODE rtc9_compress
2720
# define DECODE rtc9_decompress
@@ -385,10 +378,7 @@ u16 NET_Compressor::Compress(BYTE* dest, const u32 &dest_size, BYTE* src, const
385378
*dest = NET_TAG_COMPRESSED;
386379

387380
#if NET_USE_COMPRESSION_CRC
388-
boost::crc_32_type temp;
389-
temp.process_block( dest+offset, dest+compressed_size );
390-
u32 crc = temp.checksum();
391-
381+
u32 crc = crc32(dest+offset, compressed_size);
392382
*((u32*)(dest + 1)) = crc;
393383
#endif // NET_USE_COMPRESSION_CRC
394384

@@ -501,9 +491,7 @@ u16 NET_Compressor::Decompress (BYTE* dest, const u32 &dest_size, BYTE* src, con
501491
#endif // NET_USE_COMPRESSION_CRC
502492

503493
#if NET_USE_COMPRESSION_CRC
504-
boost::crc_32_type temp;
505-
temp.process_block (src + offset,src + count);
506-
u32 crc = temp.checksum();
494+
u32 crc = crc32(src+offset, count);
507495
// Msg ("decompressed %d -> ? [0x%08x]",count,crc);
508496
if( crc != *((u32*)(src + 1)) )
509497
Msg( "!CRC mismatch" );

0 commit comments

Comments
 (0)