From 92840aabf7a96583619a01a8257ef6f117f0ca50 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 12 Apr 2014 19:44:46 +1200 Subject: 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 Reviewed-by: Kenneth Graunke --- src/glsl/link_uniform_initializers.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/glsl') diff --git a/src/glsl/link_uniform_initializers.cpp b/src/glsl/link_uniform_initializers.cpp index e60bb64bcdc..2100e051716 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, -- cgit v1.2.3