commit 118bf83aae3fd99b4361ba38bf747e6478868aa8
author Lizhe Liu <lizhe.liu@intel.com> Mon Jun 01 16:55:48 2015 +0800
committer Lizhe Liu <lizhe.liu@intel.com> Mon Jun 01 17:33:56 2015 +0800
tree bf9f4b68956dbbdaa6df35e47e9333717618107f
parent ee3d16ee0486b428a1c56667540f7ab9ce56195e

Add parameters validation to glGetUniform

According to GLES2.0 Spec, glGetUniform return the value of a
uniform variable. dEQP test it with functional.negative_api.
state.get_uniformfv and functional.negative_api.state.
get_uniformiv. To pass the test cases, we should add object
validation to glGetUniform API. You can see details in
https://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniform.xml

Change-Id: Idf95805419fa90d813c9a94765fa6731be6ca661
Signed-off-by: Lizhe Liu <lizhe.liu@intel.com>

opengl/system/GLESv2_enc/GL2Encoder.cpp

diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp
index b3c557b..1dc8015 100755
--- a/opengl/system/GLESv2_enc/GL2Encoder.cpp
+++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp
@@ -779,7 +779,8 @@
 void GL2Encoder::s_glGetUniformiv(void *self, GLuint program, GLint location, GLint* params)
 {
     GL2Encoder *ctx = (GL2Encoder*)self;
-    SET_ERROR_IF(!ctx->m_shared->isProgram(program), GL_INVALID_VALUE);
+    SET_ERROR_IF(!ctx->m_shared->isObject(program), GL_INVALID_VALUE);
+    SET_ERROR_IF(!ctx->m_shared->isProgram(program), GL_INVALID_OPERATION);
     SET_ERROR_IF(!ctx->m_shared->isProgramInitialized(program), GL_INVALID_OPERATION);
     GLint hostLoc = ctx->m_shared->locationWARAppToHost(program, location);
     SET_ERROR_IF(ctx->m_shared->getProgramUniformType(program,hostLoc)==0, GL_INVALID_OPERATION);
@@ -788,7 +789,8 @@
 void GL2Encoder::s_glGetUniformfv(void *self, GLuint program, GLint location, GLfloat* params)
 {
     GL2Encoder *ctx = (GL2Encoder*)self;
-    SET_ERROR_IF(!ctx->m_shared->isProgram(program), GL_INVALID_VALUE);
+    SET_ERROR_IF(!ctx->m_shared->isObject(program), GL_INVALID_VALUE);
+    SET_ERROR_IF(!ctx->m_shared->isProgram(program), GL_INVALID_OPERATION);
     SET_ERROR_IF(!ctx->m_shared->isProgramInitialized(program), GL_INVALID_OPERATION);
     GLint hostLoc = ctx->m_shared->locationWARAppToHost(program,location);
     SET_ERROR_IF(ctx->m_shared->getProgramUniformType(program,hostLoc)==0, GL_INVALID_OPERATION);