commit e60508840c2cf59c0fd6f8986d8c80c9f7425615
author Nicolas Capens <nicolas@transgaming.com> Mon Jul 08 10:43:10 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:08:09 2013 -0400
tree 5e5c6be302d92f235bcdd8df2d874598d54de26f
parent a940ae4940eec6a49ea0e9e437eb3061099d0b34

Handle new sampler types.

TRAC #23472
Signed-off-by: Geoff Lang
Signed-off-by: Shannon Woods
Author: Nicolas Capens

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index a1a0dc3..415de2c 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -1420,7 +1420,7 @@
     {
         gl::Uniform *uniform = *uniform_iterator;
 
-        if (uniform->type !=  GL_SAMPLER_2D && uniform->type != GL_SAMPLER_CUBE)
+        if (!gl::IsSampler(uniform->type))
         {
             if (uniform->isReferencedByVertexShader() && mapVS)
             {