mesa: Move the _mesa_uniform_merge_location_offset to glGetUniformLocation().
authorEric Anholt <eric@anholt.net>
Mon, 25 Jun 2012 17:23:24 +0000 (10:23 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 20 Jul 2012 17:43:33 +0000 (10:43 -0700)
commitabcdbdf9cce3c7520ee999fac3099d609960847d
treefd3c3bb8d17baff017aeea9819d04fd695c31a6b
parentf609cf782ab5e90ddf045dc4b0da8cebf99be0d1
mesa: Move the _mesa_uniform_merge_location_offset to glGetUniformLocation().

With the upcoming GL_ARB_uniform_buffer_object changes, the only
other caller that will want the cooked value is state_tracker.

Reviewed-by: Ian Romanick <ian.d.romanick@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