commit 097f0c82c73ca7f9106de341223edb44ac4192d3
author Lizhe Liu <lizhe.liu@intel.com> Mon Jun 08 11:36:06 2015 +0800
committer Lizhe Liu <lizhe.liu@intel.com> Mon Jun 08 13:17:58 2015 +0800
tree a9338a8750e528ebce116c4fe74009e776cc9ce2
parent 6833eaf65decabaf38bc6d44e2fdbe3504f66a6a

Fix glVertexAttrib API state issue

glVertexAttrib API state value in dEQP tests are not always correct.
The family get_vertex_attrib API do not check input parameters such
as type and index. These issues should be modified.

Change-Id: Ifa019c020a52959dc779f3dab12dc7793f9b1327
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 1dc8015..4bcd6a0 100755
--- a/opengl/system/GLESv2_enc/GL2Encoder.cpp
+++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp
@@ -432,6 +432,9 @@
 {
     GL2Encoder *ctx = (GL2Encoder *)self;
     assert(ctx->m_state);
+    GLint maxIndex;
+    ctx->glGetIntegerv(self, GL_MAX_VERTEX_ATTRIBS, &maxIndex);
+    SET_ERROR_IF(!(index < maxIndex), GL_INVALID_VALUE);
 
     if (!ctx->m_state->getVertexAttribParameter<GLint>(index, pname, params)) {
         ctx->m_glGetVertexAttribiv_enc(self, index, pname, params);
@@ -442,6 +445,9 @@
 {
     GL2Encoder *ctx = (GL2Encoder *)self;
     assert(ctx->m_state);
+    GLint maxIndex;
+    ctx->glGetIntegerv(self, GL_MAX_VERTEX_ATTRIBS, &maxIndex);
+    SET_ERROR_IF(!(index < maxIndex), GL_INVALID_VALUE);
 
     if (!ctx->m_state->getVertexAttribParameter<GLfloat>(index, pname, params)) {
         ctx->m_glGetVertexAttribfv_enc(self, index, pname, params);
@@ -452,6 +458,10 @@
 {
     GL2Encoder *ctx = (GL2Encoder *)self;
     if (ctx->m_state == NULL) return;
+    GLint maxIndex;
+    ctx->glGetIntegerv(self, GL_MAX_VERTEX_ATTRIBS, &maxIndex);
+    SET_ERROR_IF(!(index < maxIndex), GL_INVALID_VALUE);
+    SET_ERROR_IF(pname != GL_VERTEX_ATTRIB_ARRAY_POINTER, GL_INVALID_ENUM);
 
     (void)pname;