[Mesa-dev] [PATCH] glsl: Allow explicit binding on atomics again

[Kenneth Graunke]

On 04/12/2014 12:44 AM, Chris Forbes wrote:
> As of 943b2d52bf5, layout(binding) on an atomic would fail the assertion
> here.
> 
> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
> Cc: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/glsl/link_uniform_initializers.cpp | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp
> index e60bb64..2100e05 100644
> --- a/src/glsl/link_uniform_initializers.cpp
> +++ b/src/glsl/link_uniform_initializers.cpp
> @@ -296,8 +296,10 @@ link_set_uniform_initializers(struct gl_shader_program *prog)
>                    linker::set_block_binding(prog, iface_type->name,
>                                              var->data.binding);
>                 }
> +            } else if (type->contains_atomic()) {
> +               /* we don't actually need to do anything. */
>              } else {
> -               assert(!"Explicit binding not on a sampler or UBO.");
> +               assert(!"Explicit binding not on a sampler, UBO or atomic.");
>              }
>           } else if (var->constant_value) {
>              linker::set_uniform_initializer(mem_ctx, prog, var->name,
> 

I went ahead and pushed this with:
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

I'm not entirely clear why nothing needs to happen, but we've always
done nothing here, and all of our tests worked.  This fixes a regression
and gets all of our tests working again, and it's been a week, and
nobody more knowledgeable stepped up to review it...so...pushed.

Thanks for the fix, Chris.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140418/36861a47/attachment-0001.sig>