From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 21 Feb 2015 23:33:03 +0000 (+0100)
Subject: mesa: add a missing GS support check in GetActiveUniformBlockiv
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=002aa7502245805def2fd9bb1bc83284019757fe;p=mesa.git

mesa: add a missing GS support check in GetActiveUniformBlockiv

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index e471b878ce6..4bb3dfbcd94 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;