summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Software/Rasterizer.cpp
diff options
context:
space:
mode:
authorcrudelios <crudelios@gmail.com>2014-09-16 20:18:15 +0100
committercrudelios <crudelios@gmail.com>2014-10-10 12:28:13 +0100
commit47c67f014f9f882e27e29203eab97dc3c7753f6a (patch)
treed1516749bc49ce3eecea7442a4b1def630506209 /Source/Core/VideoBackends/Software/Rasterizer.cpp
parent2d4b7e3f3f67f48ec2fb3d8eb8b2af3b70e4afcc (diff)
Fix linux build and various warnings.
Increase savestate version.
Diffstat (limited to 'Source/Core/VideoBackends/Software/Rasterizer.cpp')
-rw-r--r--Source/Core/VideoBackends/Software/Rasterizer.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp
index d797b9158e..6dfc61f9c5 100644
--- a/Source/Core/VideoBackends/Software/Rasterizer.cpp
+++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp
@@ -533,7 +533,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
// Build the new raster block every other pixel
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])
break;
@@ -560,9 +560,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
if (x >= BoundingBox::coords[BoundingBox::LEFT])
break;
- s32 CY1 = CX1;
- s32 CY2 = CX2;
- s32 CY3 = CX3;
+ CY1 = CX1;
+ CY2 = CX2;
+ CY3 = CX3;
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
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])
break;
@@ -595,9 +595,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
// Loop
for (s32 y = maxy; y >= miny; --y)
{
- s32 CX1 = CY1;
- s32 CX2 = CY2;
- s32 CX3 = CY3;
+ CX1 = CY1;
+ CX2 = CY2;
+ CX3 = CY3;
if (y <= BoundingBox::coords[BoundingBox::BOTTOM])
break;
@@ -609,7 +609,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
// Build the new raster block every other pixel
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])
break;
@@ -636,9 +636,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
if (x <= BoundingBox::coords[BoundingBox::RIGHT])
break;
- s32 CY1 = CX1;
- s32 CY2 = CX2;
- s32 CY3 = CX3;
+ CY1 = CX1;
+ CY2 = CX2;
+ CY3 = CX3;
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
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])
break;