summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/uniforms.c
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2015-02-22 00:33:03 +0100
committerMarek Olšák <marek.olsak@amd.com>2015-02-24 21:21:04 +0100
commit002aa7502245805def2fd9bb1bc83284019757fe (patch)
tree405f1b7329ab98c0830275f7213772ed6ba38586 /src/mesa/main/uniforms.c
parentd80701df8af4a5d74c4f4eb09a4b3cef6970104b (diff)
downloadexternal_mesa3d-002aa7502245805def2fd9bb1bc83284019757fe.zip
external_mesa3d-002aa7502245805def2fd9bb1bc83284019757fe.tar.gz
external_mesa3d-002aa7502245805def2fd9bb1bc83284019757fe.tar.bz2
mesa: add a missing GS support check in GetActiveUniformBlockiv
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/uniforms.c')
-rw-r--r--src/mesa/main/uniforms.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index e471b87..4bb3dfb 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -1142,6 +1142,8 @@ _mesa_GetActiveUniformBlockiv(GLuint program,
return;
case GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER:
+ if (!_mesa_has_geometry_shaders(ctx))
+ break;
params[0] = shProg->UniformBlockStageIndex[MESA_SHADER_GEOMETRY][uniformBlockIndex] != -1;
return;