commit 79d2dbed5a08e0d3f65646d52b4bb884cd0af9b5
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 13 19:28:02 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 13 19:28:02 2011 +0000
tree c268ce162808024eac81a47db1175d2a434f3727
parent 5a23424b409a45169928f4be1f68b3ab7131e783

uint32_t -> int for texture extents

Review URL: http://codereview.appspot.com/4584053/



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

gpu/src/GrGpuGL.cpp

diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index 2d7d512..cbfcc6e 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -770,7 +770,7 @@
             size_t trimSize = desc.fHeight * trimRowBytes;
             const char* src = (const char*)srcData;
             char* dst = (char*)trimStorage.realloc(trimSize);
-            for (uint32_t y = 0; y < desc.fHeight; y++) {
+            for (int y = 0; y < desc.fHeight; y++) {
                 memcpy(dst, src, trimRowBytes);
                 src += rowBytes;
                 dst += trimRowBytes;
@@ -786,19 +786,19 @@
             glDesc.fAllocHeight = GrNextPow2(desc.fHeight);
         }
 
-        glDesc.fAllocWidth = GrMax<int>(fMinRenderTargetWidth,
-                                        glDesc.fAllocWidth);
-        glDesc.fAllocHeight = GrMax<int>(fMinRenderTargetHeight,
-                                         glDesc.fAllocHeight);
-        if ((int)glDesc.fAllocWidth > fMaxRenderTargetSize ||
-            (int)glDesc.fAllocHeight > fMaxRenderTargetSize) {
+        glDesc.fAllocWidth = GrMax(fMinRenderTargetWidth,
+                                   glDesc.fAllocWidth);
+        glDesc.fAllocHeight = GrMax(fMinRenderTargetHeight,
+                                    glDesc.fAllocHeight);
+        if (glDesc.fAllocWidth > fMaxRenderTargetSize ||
+            glDesc.fAllocHeight > fMaxRenderTargetSize) {
             return return_null_texture();
         }
     } else if (!this->npotTextureSupport()) {
         glDesc.fAllocWidth  = GrNextPow2(desc.fWidth);
         glDesc.fAllocHeight = GrNextPow2(desc.fHeight);
-        if ((int)glDesc.fAllocWidth > fMaxTextureSize ||
-            (int)glDesc.fAllocHeight > fMaxTextureSize) {
+        if (glDesc.fAllocWidth > fMaxTextureSize ||
+            glDesc.fAllocHeight > fMaxTextureSize) {
             return return_null_texture();
         }
     }
@@ -840,9 +840,9 @@
                                 glDesc.fUploadType, srcData));
             GrGLRestoreResetRowLength();
 
-            uint32_t extraW = glDesc.fAllocWidth  - desc.fWidth;
-            uint32_t extraH = glDesc.fAllocHeight - desc.fHeight;
-            uint32_t maxTexels = extraW * extraH;
+            int extraW = glDesc.fAllocWidth  - desc.fWidth;
+            int extraH = glDesc.fAllocHeight - desc.fHeight;
+            int maxTexels = extraW * extraH;
             maxTexels = GrMax(extraW * desc.fHeight, maxTexels);
             maxTexels = GrMax(desc.fWidth * extraH, maxTexels);
 
@@ -854,7 +854,7 @@
                                         (desc.fHeight - 1) * rowSize;
                 uint8_t* extraRowStart = (uint8_t*)texels.get();
 
-                for (uint32_t i = 0; i < extraH; ++i) {
+                for (int i = 0; i < extraH; ++i) {
                     memcpy(extraRowStart, lastRowStart, rowSize);
                     extraRowStart += rowSize;
                 }
@@ -865,8 +865,8 @@
             if (extraW) {
                 uint8_t* edgeTexel = (uint8_t*)srcData + rowSize - glDesc.fUploadByteCount;
                 uint8_t* extraTexel = (uint8_t*)texels.get();
-                for (uint32_t j = 0; j < desc.fHeight; ++j) {
-                    for (uint32_t i = 0; i < extraW; ++i) {
+                for (int j = 0; j < desc.fHeight; ++j) {
+                    for (int i = 0; i < extraW; ++i) {
                         memcpy(extraTexel, edgeTexel, glDesc.fUploadByteCount);
                         extraTexel += glDesc.fUploadByteCount;
                     }
@@ -880,7 +880,7 @@
                 uint8_t* cornerTexel = (uint8_t*)srcData + desc.fHeight * rowSize
                                        - glDesc.fUploadByteCount;
                 uint8_t* extraTexel = (uint8_t*)texels.get();
-                for (uint32_t i = 0; i < extraW*extraH; ++i) {
+                for (int i = 0; i < extraW*extraH; ++i) {
                     memcpy(extraTexel, cornerTexel, glDesc.fUploadByteCount);
                     extraTexel += glDesc.fUploadByteCount;
                 }