commit 0027fa9fcad8a68cfe7cc6909e1b5e6413ec3443
author Nicolas Capens <nicolascapens@chromium.org> Thu Feb 20 14:26:42 2014 -0500
committer Nicolas Capens <nicolascapens@chromium.org> Tue Mar 04 18:54:23 2014 +0000
tree 8a45aec3fdeaa3f0f6f52ed4b7f16eafe1ef55c8
parent 9c90d7ed5ed18f7512af75e0f91e24aebdd439fa

Emulate integer cube texture sampling as an array of six 2D textures.

BUG=angle:525

Change-Id: I3c3ec2cecebf9e745f0c02a132433e3076a6fdea
Reviewed-on: https://chromium-review.googlesource.com/187534
Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/formatutils.cpp

diff --git a/src/libGLESv2/formatutils.cpp b/src/libGLESv2/formatutils.cpp
index 9683a98..bc303fe 100644
--- a/src/libGLESv2/formatutils.cpp
+++ b/src/libGLESv2/formatutils.cpp
@@ -1353,7 +1353,7 @@
     }
 }
 
-GLuint GetComponentType(GLenum internalFormat, GLuint clientVersion)
+GLenum GetComponentType(GLenum internalFormat, GLuint clientVersion)
 {
     InternalFormatInfo internalFormatInfo;
     if (GetInternalFormatInfo(internalFormat, clientVersion, &internalFormatInfo))
@@ -1363,7 +1363,7 @@
     else
     {
         UNREACHABLE();
-        return false;
+        return GL_NONE;
     }
 }