Revert "Fix lots of variable shadowing in ANGLE"
Caused WebGL CTS failures on the texture-npot test:
https://www.khronos.org/registry/webgl/sdk/tests/conformance/textures/texture-npot.html
This reverts commit c67e6e9fade44ef8938724e82db11db725e9c8e5.
Change-Id: I089e99859231e0d657084ac3647257c650a9da92
Reviewed-on: https://chromium-review.googlesource.com/243041
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/formatutils.cpp b/src/libANGLE/formatutils.cpp
index 0ebc67a..fa2725d 100644
--- a/src/libANGLE/formatutils.cpp
+++ b/src/libANGLE/formatutils.cpp
@@ -560,18 +560,18 @@
}
}
-GLuint InternalFormat::computeRowPitch(GLenum formatType, GLsizei width, GLint alignment) const
+GLuint InternalFormat::computeRowPitch(GLenum type, GLsizei width, GLint alignment) const
{
ASSERT(alignment > 0 && isPow2(alignment));
- return rx::roundUp(computeBlockSize(formatType, width, 1), static_cast<GLuint>(alignment));
+ return rx::roundUp(computeBlockSize(type, width, 1), static_cast<GLuint>(alignment));
}
-GLuint InternalFormat::computeDepthPitch(GLenum formatType, GLsizei width, GLsizei height, GLint alignment) const
+GLuint InternalFormat::computeDepthPitch(GLenum type, GLsizei width, GLsizei height, GLint alignment) const
{
- return computeRowPitch(formatType, width, alignment) * height;
+ return computeRowPitch(type, width, alignment) * height;
}
-GLuint InternalFormat::computeBlockSize(GLenum formatType, GLsizei width, GLsizei height) const
+GLuint InternalFormat::computeBlockSize(GLenum type, GLsizei width, GLsizei height) const
{
if (compressed)
{
@@ -581,7 +581,7 @@
}
else
{
- const Type &typeInfo = GetTypeInfo(formatType);
+ const Type &typeInfo = GetTypeInfo(type);
if (typeInfo.specialInterpretation)
{
return typeInfo.bytes * width * height;