Fix compilation error on 32-bit systems

a99ed554 introduced explicit template instantiations that tunred out to be the same on 32-bit CPUs because GLenum and size_t are the same type. BUG=angleproject:2165 Change-Id: I85fafeff1996cb457f2b718e177944fc6aca50bf Reviewed-on: https://chromium-review.googlesource.com/699839 Commit-Queue: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>

Fix compilation error on 32-bit systems
10d4026b · Corentin Wallez · Commit Bot · cb62d86f · 10d4026b · 10d4026b
Commit 10d4026b authored Oct 04, 2017 by Corentin Wallez Committed by Commit Bot Oct 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

queryconversions.cpp src/libANGLE/queryconversions.cpp +0 -2

queryutils.cpp src/libANGLE/queryutils.cpp +6 -3

No files found.
--- a/src/libANGLE/queryconversions.cpp
+++ b/src/libANGLE/queryconversions.cpp
@@ -83,8 +83,6 @@ template GLuint CastFromGLintStateValue<GLuint, GLenum>(GLenum pname, GLenum val
 template GLfloat CastFromGLintStateValue<GLfloat, bool>(GLenum pname, bool value);
 template GLuint CastFromGLintStateValue<GLuint, bool>(GLenum pname, bool value);
 template GLint CastFromGLintStateValue<GLint, bool>(GLenum pname, bool value);
-template GLfloat CastFromGLintStateValue<GLfloat, size_t>(GLenum pname, size_t value);
-template GLint CastFromGLintStateValue<GLint, size_t>(GLenum pname, size_t value);
 template <typename QueryT, typename NativeT>
 QueryT CastFromStateValue(GLenum pname, NativeT value)

--- a/src/libANGLE/queryutils.cpp
+++ b/src/libANGLE/queryutils.cpp
@@ -89,13 +89,16 @@ void QueryTexLevelParameterBase(const Texture *texture,
                pname, info->internalFormat ? info->internalFormat : GL_RGBA);
            break;
        case GL_TEXTURE_WIDTH:
-            *params = CastFromGLintStateValue<ParamType>(pname, texture->getWidth(target, level));
+            *params = CastFromGLintStateValue<ParamType>(
+                pname, static_cast<uint32_t>(texture->getWidth(target, level)));
            break;
        case GL_TEXTURE_HEIGHT:
-            *params = CastFromGLintStateValue<ParamType>(pname, texture->getHeight(target, level));
+            *params = CastFromGLintStateValue<ParamType>(
+                pname, static_cast<uint32_t>(texture->getHeight(target, level)));
            break;
        case GL_TEXTURE_DEPTH:
-            *params = CastFromGLintStateValue<ParamType>(pname, texture->getDepth(target, level));
+            *params = CastFromGLintStateValue<ParamType>(
+                pname, static_cast<uint32_t>(texture->getDepth(target, level)));
            break;
        case GL_TEXTURE_SAMPLES:
            *params = CastFromStateValue<ParamType>(pname, texture->getSamples(target, level));