glsl: Add gl_shader_program::UniformLocationBaseScale
authorIan Romanick <ian.d.romanick@intel.com>
Mon, 10 Jun 2013 17:35:05 +0000 (10:35 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Wed, 12 Jun 2013 23:30:18 +0000 (16:30 -0700)
commit26d86d26f9f972b19c7040bdb1b1daf48537ef3e
treee457f7c4d14e6781949bf339c09863f6cf24ba32
parent5097f358419c067a71e96e39764b3bb0a716bdbb
glsl: Add gl_shader_program::UniformLocationBaseScale

This is used by _mesa_uniform_merge_location_offset and
_mesa_uniform_split_location_offset to determine how the base and offset
are packed.  Previously, this value was hard coded as (1U<<16) in those
functions via the shift and mask contained therein.  The value is still
(1U<<16), but it can be changed in the future.

The next patch dynamically generates this value.

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/glsl/link_uniforms.cpp
src/mesa/main/mtypes.h
src/mesa/main/shaderobj.c
src/mesa/main/uniforms.h