commit f494c9ca938169abdef13612c6f3029fbf218a07
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed May 11 15:37:05 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed May 11 15:37:05 2011 +0000
tree 2ac56ce4c75e78445088baf4be21ea41b2efd3ab
parent 424bb49d4d9e62bc66e30d074d4cf18e25860353

Validate the sampler uniform against the number of (combined) texture image units.

Issue=95
TRAC #16568
Signed-off-by: Daniel Koch
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/trunk@642 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index 42b5b07..26a9ff2 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2604,7 +2604,7 @@
     applyShaders();
     applyTextures();
 
-    if (!getCurrentProgram()->validateSamplers())
+    if (!getCurrentProgram()->validateSamplers(false))
     {
         return error(GL_INVALID_OPERATION);
     }
@@ -2671,7 +2671,7 @@
     applyShaders();
     applyTextures();
 
-    if (!getCurrentProgram()->validateSamplers())
+    if (!getCurrentProgram()->validateSamplers(false))
     {
         return error(GL_INVALID_OPERATION);
     }