glsl: Add a gl_shader_program parameter to _mesa_uniform_{merge,split}_location_offset
authorIan Romanick <ian.d.romanick@intel.com>
Mon, 10 Jun 2013 17:33:59 +0000 (10:33 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Wed, 12 Jun 2013 23:30:06 +0000 (16:30 -0700)
commit5097f358419c067a71e96e39764b3bb0a716bdbb
tree5b84db82f7a16836baf6018ca397ae180f1e75f4
parent4cce4efaa38e95c121343565de5e517345d6a9dd
glsl: Add a gl_shader_program parameter to _mesa_uniform_{merge,split}_location_offset

This will be used in the next commit.

NOTE: This is a candidate for stable release branches.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
src/mesa/main/uniform_query.cpp
src/mesa/main/uniforms.c
src/mesa/main/uniforms.h
src/mesa/state_tracker/st_glsl_to_tgsi.cpp