commit 6a77cc5dde4bc01a0a9ba9ac32140146247d113f
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 28 17:33:34 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Apr 28 17:33:34 2011 +0000
tree 8eba152fa8207b2c261b82c7a4b3d3a21e5e3f69
parent ee5ee582430196ee3a9b9473bf865e060515996c

Fix warnings.



git-svn-id: http://skia.googlecode.com/svn/trunk@1209 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrGpuGLShaders.cpp

diff --git a/gpu/src/GrGpuGLShaders.cpp b/gpu/src/GrGpuGLShaders.cpp
index ff9f3a4..8ffadeb 100644
--- a/gpu/src/GrGpuGLShaders.cpp
+++ b/gpu/src/GrGpuGLShaders.cpp
@@ -509,6 +509,7 @@
     } else
 #endif
     {
+        if (requiresAttributeColors) {} // suppress unused var warning
         desc.fColorType = GrGLProgram::ProgramDesc::kAttribute_ColorType;
     }
 

gpu/src/GrGpuGLShaders2.cpp

diff --git a/gpu/src/GrGpuGLShaders2.cpp b/gpu/src/GrGpuGLShaders2.cpp
index ab8a4bb..6abfcdc 100644
--- a/gpu/src/GrGpuGLShaders2.cpp
+++ b/gpu/src/GrGpuGLShaders2.cpp
@@ -1038,6 +1038,7 @@
     } else
 #endif
     {
+        if (requiresAttributeColors) {} // suppress unused var warning
         desc->fColorType = ProgramDesc::kAttribute_ColorType;
     }
 

gpu/src/GrInOrderDrawBuffer.cpp

diff --git a/gpu/src/GrInOrderDrawBuffer.cpp b/gpu/src/GrInOrderDrawBuffer.cpp
index 2ea12e1..7df1f23 100644
--- a/gpu/src/GrInOrderDrawBuffer.cpp
+++ b/gpu/src/GrInOrderDrawBuffer.cpp
@@ -359,9 +359,9 @@
     // on the stack.
     GrDrawTarget::AutoGeometrySrcRestore agsr(target);
 
-    uint32_t currState = ~0;
-    uint32_t currClip  = ~0;
-    uint32_t currClear = 0;
+    int currState = ~0;
+    int currClip  = ~0;
+    int currClear = 0;
 
     for (int i = 0; i < numDraws; ++i) {
         while (currClear < fClears.count() &&