summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarta Lofstedt <marta.lofstedt@intel.com>2015-08-19 20:25:23 +0200
committerMarta Lofstedt <marta.lofstedt@linux.intel.com>2015-09-22 12:22:06 +0200
commitcf293e518ebd847cb28e03d4378679c47548206d (patch)
tree0746e923f0a88c9d1be1841b9e9dcf494a633030 /src
parent6c3de8996fbe9447e092cc75ccdd6f720fabaf4d (diff)
downloadexternal_mesa3d-cf293e518ebd847cb28e03d4378679c47548206d.zip
external_mesa3d-cf293e518ebd847cb28e03d4378679c47548206d.tar.gz
external_mesa3d-cf293e518ebd847cb28e03d4378679c47548206d.tar.bz2
mesa/es3.1: Allow query of Vertex bindings for GLES 3.1
Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/get.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index d5df530..926caef 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1969,7 +1969,8 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
return TYPE_INT64;
case GL_VERTEX_BINDING_DIVISOR:
- if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_instanced_arrays)
+ if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_instanced_arrays) &&
+ !_mesa_is_gles31(ctx))
goto invalid_enum;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)
goto invalid_value;
@@ -1977,7 +1978,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
return TYPE_INT;
case GL_VERTEX_BINDING_OFFSET:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
goto invalid_enum;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)
goto invalid_value;
@@ -1985,7 +1986,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
return TYPE_INT;
case GL_VERTEX_BINDING_STRIDE:
- if (!_mesa_is_desktop_gl(ctx))
+ if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles31(ctx))
goto invalid_enum;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs)
goto invalid_value;