mesa: fix uniforms calculation in glGetProgramiv
authorTapani Pälli <tapani.palli@intel.com>
Fri, 30 Oct 2015 12:30:35 +0000 (14:30 +0200)
committerTapani Pälli <tapani.palli@intel.com>
Mon, 2 Nov 2015 09:22:10 +0000 (11:22 +0200)
commitf4466c856f6147885be52aff6314452784b30189
tree84a1f3200011d77b3b2cfc6d5af3d929376c8dab
parentefb333acb7ab4f9007cbeb0653783689101b0dd5
mesa: fix uniforms calculation in glGetProgramiv

Since introduction of SSBO, UniformStorage contains not just uniforms
but also buffer variables, this needs to be taken in to account when
calculating active uniforms with GL_ACTIVE_UNIFORMS and
GL_ACTIVE_UNIFORM_MAX_LENGTH.

No Piglit regressions.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
src/mesa/main/shaderapi.c