commit a7b4ab45d08d8469daefb9f2af34ad6860b9fc3b
author Samuel Iglesias Gonsalvez <siglesias@igalia.com> Tue Apr 21 12:12:05 2015 +0200
committer Samuel Iglesias Gonsalvez <siglesias@igalia.com> Fri Sep 25 08:39:22 2015 +0200
tree 358328f546da9be419cf05a6a4b70185153d7dcd
parent e854a9800120ac0b1930da27f39207a35a637779

glsl: a shader storage buffer must be smaller than the maximum size allowed

Otherwise, generate a link time error as per the
ARB_shader_storage_buffer_object spec.

v2:
- Fix error message (Jordan)

v3:
- Move std140_size() changes to its own patch (Kristian)

Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>

src/glsl/linker.cpp

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 47d8b5a..c0520be 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -1996,7 +1996,7 @@
 
    /* Link up uniform blocks defined within this stage. */
    const unsigned num_uniform_blocks =
-      link_uniform_blocks(mem_ctx, prog, shader_list, num_shaders,
+      link_uniform_blocks(mem_ctx, ctx, prog, shader_list, num_shaders,
                           &uniform_blocks);
    if (!prog->LinkStatus)
       return NULL;