[Mesa-stable] [PATCH 3/7] linker: Fold set_uniform_binding into call site

[Carl Worth]

Ian Romanick <idr at freedesktop.org> writes:
> 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.

Hi Ian,

I should have looked closer at this commit when I was reviewing it for
the stable series.

The commit message and structure of the patch led me to believe that a
function was being inlined without a behavioral change.

However, the new assert is causing regressions for the following piglit
tests:

 all/spec/ARB_shader_atomic_counters
	active-counters
        compiler/
		expression-allowed.frag
		default-partition
		fragment-discard
		function-argument 

Such as:

$ ./bin/arb_shader_atomic_counters-active-counters -fbo -auto 
arb_shader_atomic_counters-active-counters: ../../src/glsl/link_uniform_initializers.cpp:257: void link_set_uniform_initializers(gl_shader_program*): Assertion `!"Explicit binding not on a sampler or UBO."' failed.
Aborted

Other than this set of regressions, I like the state of the 10.1 branch
I have. What do you recommend?

-Carl

-- 
carl.d.worth at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20140416/d03ce5b1/attachment.sig>