linker: Fold set_uniform_binding into call site
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 4 Apr 2014 18:08:00 +0000 (11:08 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 11 Apr 2014 19:26:01 +0000 (12:26 -0700)
commit943b2d52bf5df6adde3c0abcb91d9a3899476ab0
treeadbf8d2db208faa99c8b05b61a357715c7f7ea84
parent881c52f13f4a8ca1c80ca1766238d5100ddf283b
linker: Fold set_uniform_binding into call site

In the next patch, we'll see that using
gl_shader_program::UniformStorage is not correct for uniform blocks.
That means we can't use ::UniformStorage to select between the sampler
path and the block path.  Instead we want to just use the type of the
variable.  That's never passed to set_uniform_binding, and it's easier
to just remove the function (especially for later patches in the series)
than to add another parameter.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76323
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "10.1" <mesa-stable@lists.freedesktop.org>
Cc: github@socker.lepus.uberspace.de
src/glsl/link_uniform_initializers.cpp