commit 2ec386bbec5918114a11e6fa574a353c954c1017
author Geoff Lang <geofflang@chromium.org> Wed Dec 03 14:44:38 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Wed Dec 03 20:15:00 2014 +0000
tree 36b25f2cce9a2dc8e271bb75343f11ff3121a7d0
parent 597235416e1ab2196eb166ad1db6e9d71d8bb615

Rename IsSampler to IsSamplerType.

BUG=angle:733

Change-Id: I62aece16c11aefdbf13c0b5faf83040fdb8555e6
Reviewed-on: https://chromium-review.googlesource.com/232960
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/validationES.cpp

diff --git a/src/libANGLE/validationES.cpp b/src/libANGLE/validationES.cpp
index 08ded1d..3f144bd 100644
--- a/src/libANGLE/validationES.cpp
+++ b/src/libANGLE/validationES.cpp
@@ -1107,7 +1107,7 @@
     }
 
     GLenum targetBoolType = VariableBoolVectorType(uniformType);
-    bool samplerUniformCheck = (IsSampler(uniform->type) && uniformType == GL_INT);
+    bool samplerUniformCheck = (IsSamplerType(uniform->type) && uniformType == GL_INT);
     if (!samplerUniformCheck && uniformType != uniform->type && targetBoolType != uniform->type)
     {
         context->recordError(Error(GL_INVALID_OPERATION));