summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Software/Clipper.cpp
diff options
context:
space:
mode:
authorskidau <skidau@gmail.com>2014-10-05 12:14:04 +1100
committerskidau <skidau@gmail.com>2014-10-05 12:14:04 +1100
commit871d308b88235c115e49267ca79e4f1d48fba0f7 (patch)
tree71073098f0902886bbe5271a9d725567de41f3f9 /Source/Core/VideoBackends/Software/Clipper.cpp
parent47bf698b70668f72f8495da209ffe68091d89bcf (diff)
parent7f6284c2fcea9d543b0eec44ea0f3ad36bd0c0aa (diff)
Merge pull request #1206 from comex/amperspocalypse
Change a bunch of reference function arguments to pointers.
Diffstat (limited to 'Source/Core/VideoBackends/Software/Clipper.cpp')
-rw-r--r--Source/Core/VideoBackends/Software/Clipper.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp
index f0ef19cd4e..d498a5c355 100644
--- a/Source/Core/VideoBackends/Software/Clipper.cpp
+++ b/Source/Core/VideoBackends/Software/Clipper.cpp
@@ -113,10 +113,9 @@ namespace Clipper
return cmask;
}
- static inline void AddInterpolatedVertex(float t, int out, int in, int& numVertices)
+ static inline void AddInterpolatedVertex(float t, int out, int in, int* numVertices)
{
- Vertices[numVertices]->Lerp(t, Vertices[out], Vertices[in]);
- numVertices++;
+ Vertices[(*numVertices)++]->Lerp(t, Vertices[out], Vertices[in]);
}
#define DIFFERENT_SIGNS(x,y) ((x <= 0 && y > 0) || (x > 0 && y <= 0))
@@ -142,10 +141,10 @@ namespace Clipper
if (DIFFERENT_SIGNS(dp, dpPrev)) { \
if (dp < 0) { \
float t = dp / (dp - dpPrev); \
- AddInterpolatedVertex(t, idx, idxPrev, numVertices); \
+ AddInterpolatedVertex(t, idx, idxPrev, &numVertices); \
} else { \
float t = dpPrev / (dpPrev - dp); \
- AddInterpolatedVertex(t, idxPrev, idx, numVertices); \
+ AddInterpolatedVertex(t, idxPrev, idx, &numVertices); \
} \
outlist[outcount++] = numVertices - 1; \
} \
@@ -187,7 +186,7 @@ namespace Clipper
} \
}
- static void ClipTriangle(int *indices, int &numIndices)
+ static void ClipTriangle(int *indices, int* numIndices)
{
int mask = 0;
@@ -229,9 +228,9 @@ namespace Clipper
indices[2] = inlist[2];
for (int j = 3; j < n; ++j)
{
- indices[numIndices++] = inlist[0];
- indices[numIndices++] = inlist[j - 1];
- indices[numIndices++] = inlist[j];
+ indices[(*numIndices)++] = inlist[0];
+ indices[(*numIndices)++] = inlist[j - 1];
+ indices[(*numIndices)++] = inlist[j];
}
}
}
@@ -276,13 +275,13 @@ namespace Clipper
if (clip_mask[0])
{
indices[0] = numVertices;
- AddInterpolatedVertex(t0, 0, 1, numVertices);
+ AddInterpolatedVertex(t0, 0, 1, &numVertices);
}
if (clip_mask[1])
{
indices[1] = numVertices;
- AddInterpolatedVertex(t1, 1, 0, numVertices);
+ AddInterpolatedVertex(t1, 1, 0, &numVertices);
}
}
@@ -315,7 +314,7 @@ namespace Clipper
Vertices[2] = v2;
}
- ClipTriangle(indices, numIndices);
+ ClipTriangle(indices, &numIndices);
for (int i = 0; i+3 <= numIndices; i+=3)
{