The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 06:39:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux build and various warnings.

Browse Source 
Increase savestate version.
This commit is contained in:
crudelios 2014-09-16 20:18:15 +01:00
parent 2d4b7e3f3f
commit 47c67f014f
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/State.cpp
View File

@ -63,7 +63,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread; static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 35; static const u32 STATE_VERSION = 36;
enum enum
{ {

26
Source/Core/VideoBackends/Software/Rasterizer.cpp
View File

@ -533,7 +533,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
// Build the new raster block every other pixel // Build the new raster block every other pixel
BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1)); BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1));
Draw(x, y, x & 1, y & 1); Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
if (y >= BoundingBox::coords[BoundingBox::TOP]) if (y >= BoundingBox::coords[BoundingBox::TOP])
break; break;
@ -560,9 +560,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
if (x >= BoundingBox::coords[BoundingBox::LEFT]) if (x >= BoundingBox::coords[BoundingBox::LEFT])
break; break;
s32 CY1 = CX1; CY1 = CX1;
s32 CY2 = CX2; CY2 = CX2;
s32 CY3 = CX3; CY3 = CX3;
for (s32 y = miny; y <= maxy; ++y) for (s32 y = miny; y <= maxy; ++y)
{ {
@ -571,7 +571,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
// Build the new raster block every other pixel // Build the new raster block every other pixel
BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1)); BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1));
Draw(x, y, x & 1, y & 1); Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
if (x >= BoundingBox::coords[BoundingBox::LEFT]) if (x >= BoundingBox::coords[BoundingBox::LEFT])
break; break;
@ -595,9 +595,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
// Loop // Loop
for (s32 y = maxy; y >= miny; --y) for (s32 y = maxy; y >= miny; --y)
{ {
s32 CX1 = CY1; CX1 = CY1;
s32 CX2 = CY2; CX2 = CY2;
s32 CX3 = CY3; CX3 = CY3;
if (y <= BoundingBox::coords[BoundingBox::BOTTOM]) if (y <= BoundingBox::coords[BoundingBox::BOTTOM])
break; break;
@ -609,7 +609,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
// Build the new raster block every other pixel // Build the new raster block every other pixel
BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1)); BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1));
Draw(x, y, x & 1, y & 1); Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
if (y <= BoundingBox::coords[BoundingBox::BOTTOM]) if (y <= BoundingBox::coords[BoundingBox::BOTTOM])
break; break;
@ -636,9 +636,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
if (x <= BoundingBox::coords[BoundingBox::RIGHT]) if (x <= BoundingBox::coords[BoundingBox::RIGHT])
break; break;
s32 CY1 = CX1; CY1 = CX1;
s32 CY2 = CX2; CY2 = CX2;
s32 CY3 = CX3; CY3 = CX3;
for (s32 y = maxy; y >= miny; --y) for (s32 y = maxy; y >= miny; --y)
{ {
@ -647,7 +647,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
// Build the new raster block every other pixel // Build the new raster block every other pixel
BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1)); BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1));
Draw(x, y, x & 1, y & 1); Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
if (x <= BoundingBox::coords[BoundingBox::RIGHT]) if (x <= BoundingBox::coords[BoundingBox::RIGHT])
break; break;

2
Source/Core/VideoCommon/BoundingBox.cpp
View File

@ -93,8 +93,6 @@ void LOADERDECL Update()
if (g_VtxDesc.Normal != NOT_PRESENT) if (g_VtxDesc.Normal != NOT_PRESENT)
{ {
// Feed normal input data and transform // Feed normal input data and transform
myVat.g0.NormalIndex3;
memcpy((u8 *)myVertex.normal, bufferPos + vertexDecl.normals[0].offset, sizeof(float) * 3 * ((myVat.g0.NormalElements) ? 3 : 1)); memcpy((u8 *)myVertex.normal, bufferPos + vertexDecl.normals[0].offset, sizeof(float) * 3 * ((myVat.g0.NormalElements) ? 3 : 1));
TransformUnit::TransformNormal(&myVertex, myVat.g0.NormalElements, outVertex); TransformUnit::TransformNormal(&myVertex, myVat.g0.NormalElements, outVertex);

3
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -1,4 +1,5 @@
set(SRCS BPFunctions.cpp set(SRCS BoundingBox.cpp
BPFunctions.cpp
BPMemory.cpp BPMemory.cpp
BPStructs.cpp BPStructs.cpp
CPMemory.cpp CPMemory.cpp