diff options
| author | Dave Airlie <[email protected]> | 2016-05-27 13:21:57 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-05-28 05:35:53 +1000 |
| commit | c44513a1f3dc0dd4c1a7217cca19de94e4e5b2af (patch) | |
| tree | 0f23847a489197d083e516a6a29908d2c299f1f5 /src | |
| parent | f0254fdd070d14d7910555e03ed9cd103d0f9777 (diff) | |
glsl/linker: call link_uniform blocks on linked shader.
The old code called this on the prelinked shader list,
but at this point we have the linked shader, so we should
call the interface on that alone.
This fixes a regression in:
dEQP-GLES31.functional.ssbo.layout.random.all_per_block_buffers.13
introduced in
5b2675093e863a52b610f112884ae12d42513770
glsl: handle implicit sized arrays in ssbo
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96228
Reviewed-by: Timothy Arceri <[email protected]>
Reported-by: Mark James
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 1d5552915ca..e712ee3873b 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -2318,7 +2318,7 @@ link_intrastage_shaders(void *mem_ctx, v.fixup_unnamed_interface_types(); /* Link up uniform blocks defined within this stage. */ - link_uniform_blocks(mem_ctx, ctx, prog, shader_list, num_shaders, + link_uniform_blocks(mem_ctx, ctx, prog, &linked, 1, &ubo_blocks, &num_ubo_blocks, &ssbo_blocks, &num_ssbo_blocks); |