Mesa (10.1): glsl: Allow explicit binding on atomics again

[Carl Worth]

Module: Mesa
Branch: 10.1
Commit: 8abfd157dba50be3053331ba7490c853731d9490
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8abfd157dba50be3053331ba7490c853731d9490

Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sat Apr 12 19:44:46 2014 +1200

glsl: Allow explicit binding on atomics again

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 b676ca5..d57f324 100644
--- a/src/glsl/link_uniform_initializers.cpp
+++ b/src/glsl/link_uniform_initializers.cpp
@@ -295,8 +295,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,