summaryrefslogtreecommitdiffstats
path: root/src/glsl/linker.cpp
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2012-05-01 15:10:14 -0700
committerEric Anholt <[email protected]>2012-07-20 10:44:04 -0700
commit8ab5842a6d992956ee365c0e0232c6e6b907863e (patch)
treeefdf5b2d19a5efa149904969cb9338f2f9a01b72 /src/glsl/linker.cpp
parent9feb403b0eb5365889cb01ca456a19247aaad502 (diff)
glsl: Assign locations for uniforms in UBOs using the std140 rules.
Fixes piglit layout-std140. Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/linker.cpp')
-rw-r--r--src/glsl/linker.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index dd2278545d8..bfdde4023e9 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -979,6 +979,8 @@ link_intrastage_shaders(void *mem_ctx,
struct gl_shader *sh = shader_list[i];
for (unsigned j = 0; j < shader_list[i]->NumUniformBlocks; j++) {
+ link_assign_uniform_block_offsets(shader_list[i]);
+
int index = link_cross_validate_uniform_block(mem_ctx,
&uniform_blocks,
&num_uniform_blocks,