commit 86a7a138c5166feda08f21dd48e69b3a5408a1e6
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Apr 29 03:32:32 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Apr 29 03:32:32 2010 +0000
tree ce1eadf3263443835c6db907c879d555cce82c47
parent 0b6b834a6d018e581737619da65cf0cfe26a699d

Implements ValidateProgram
TRAC #11654
Signed-off-by: Andrew Lewycky
Signed-off-by: Daniel Koch

Author:    Shannon Woods

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

src/libGLESv2/Context.cpp

diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index f21f8b6..a60d7d9 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -1861,6 +1861,11 @@
         return;
     }
 
+    if (!getCurrentProgram()->validateSamplers())
+    {
+        return error(GL_INVALID_OPERATION);
+    }
+
     if (!applyRenderTarget(false))
     {
         return error(GL_INVALID_FRAMEBUFFER_OPERATION);
@@ -1903,6 +1908,11 @@
         return;
     }
 
+    if (!getCurrentProgram()->validateSamplers())
+    {
+        return error(GL_INVALID_OPERATION);
+    }
+
     if (!applyRenderTarget(false))
     {
         return error(GL_INVALID_FRAMEBUFFER_OPERATION);