summaryrefslogtreecommitdiff
path: root/Source/Plugins/Plugin_VideoSoftware
diff options
context:
space:
mode:
authorGlenn Rice <glennricster@gmail.com>2010-02-24 03:38:36 +0000
committerGlenn Rice <glennricster@gmail.com>2010-02-24 03:38:36 +0000
commit1d40b8a5ae2e64ed329f66e9da059cde9baf24fc (patch)
tree1dc8c263a83789cac1a2a6999d1370438570f0cd /Source/Plugins/Plugin_VideoSoftware
parent3cc5d8ce6f31ffa26f7eb3f8db9de68cca9721e2 (diff)
Systematically eliminating compiler warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5117 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware')
-rw-r--r--Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp11
-rw-r--r--Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp4
2 files changed, 7 insertions, 8 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
index 6b7bdcb5ea..4011c4b5e9 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
@@ -113,11 +113,10 @@ namespace Clipper
int idxPrev = inlist[0]; \
float dpPrev = CLIP_DOTPROD(idxPrev, A, B, C, D ); \
int outcount = 0; \
- int i; \
\
inlist[n] = inlist[0]; \
- for (i = 1; i <= n; i++) { \
- int idx = inlist[i]; \
+ for (int j = 1; j <= n; j++) { \
+ int idx = inlist[j]; \
float dp = CLIP_DOTPROD(idx, A, B, C, D ); \
if (dpPrev >= 0) { \
outlist[outcount++] = idxPrev; \
@@ -190,10 +189,10 @@ namespace Clipper
indices[0] = inlist[0];
indices[1] = inlist[1];
indices[2] = inlist[2];
- for (int i = 3; i < n; ++i) {
+ for (int j = 3; j < n; ++j) {
indices[numIndices++] = inlist[0];
- indices[numIndices++] = inlist[i - 1];
- indices[numIndices++] = inlist[i];
+ indices[numIndices++] = inlist[j - 1];
+ indices[numIndices++] = inlist[j];
}
}
}
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
index 3abae6da41..6e1e0a4da6 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
@@ -327,7 +327,7 @@ void UpdateInterruptsFromVideoPlugin(u64 userdata)
void ReadFifo()
{
- bool canRead = cpreg.readptr != cpreg.writeptr && writePos < maxCommandBufferWrite;
+ bool canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
bool atBreakpoint = AtBreakpoint();
if (canRead && !atBreakpoint)
@@ -354,7 +354,7 @@ void ReadFifo()
ptr += GATHER_PIPE_SIZE;
}
- canRead = cpreg.readptr != cpreg.writeptr && writePos < maxCommandBufferWrite;
+ canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
atBreakpoint = AtBreakpoint();
} while (canRead && !atBreakpoint);