commit c67e6e9fade44ef8938724e82db11db725e9c8e5
author Austin Kinross <aukinros@microsoft.com> Wed Jan 21 16:01:07 2015 -0800
committer Geoff Lang <geofflang@chromium.org> Fri Jan 23 21:18:25 2015 +0000
tree db56808f85d41ea1e35e5ec76eb684ea6e91af06
parent 3b2f9f64dc6edca63479cdab750f1424824fbf5d

Fix lots of variable shadowing in ANGLE

BUG=angle:877

Change-Id: I15168ae32605b26aee08274464ffe68adb5a7e87
Reviewed-on: https://chromium-review.googlesource.com/242351
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Austin Kinross <aukinros@microsoft.com>

src/libANGLE/formatutils.cpp

diff --git a/src/libANGLE/formatutils.cpp b/src/libANGLE/formatutils.cpp
index fa2725d..0ebc67a 100644
--- a/src/libANGLE/formatutils.cpp
+++ b/src/libANGLE/formatutils.cpp
@@ -560,18 +560,18 @@
     }
 }
 
-GLuint InternalFormat::computeRowPitch(GLenum type, GLsizei width, GLint alignment) const
+GLuint InternalFormat::computeRowPitch(GLenum formatType, GLsizei width, GLint alignment) const
 {
     ASSERT(alignment > 0 && isPow2(alignment));
-    return rx::roundUp(computeBlockSize(type, width, 1), static_cast<GLuint>(alignment));
+    return rx::roundUp(computeBlockSize(formatType, width, 1), static_cast<GLuint>(alignment));
 }
 
-GLuint InternalFormat::computeDepthPitch(GLenum type, GLsizei width, GLsizei height, GLint alignment) const
+GLuint InternalFormat::computeDepthPitch(GLenum formatType, GLsizei width, GLsizei height, GLint alignment) const
 {
-    return computeRowPitch(type, width, alignment) * height;
+    return computeRowPitch(formatType, width, alignment) * height;
 }
 
-GLuint InternalFormat::computeBlockSize(GLenum type, GLsizei width, GLsizei height) const
+GLuint InternalFormat::computeBlockSize(GLenum formatType, GLsizei width, GLsizei height) const
 {
     if (compressed)
     {
@@ -581,7 +581,7 @@
     }
     else
     {
-        const Type &typeInfo = GetTypeInfo(type);
+        const Type &typeInfo = GetTypeInfo(formatType);
         if (typeInfo.specialInterpretation)
         {
             return typeInfo.bytes * width * height;