From f0c7866eb90c235e16c64c93e97c8ca0a5ee1fc4 Mon Sep 17 00:00:00 2001 From: Tapani Pälli Date: Mon, 29 Jun 2015 15:23:45 +0300 Subject: glsl: create program resource list after LinkShader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resource list can be created properly only after LinkShader hook has been called to make sure all dead variables have been removed. Signed-off-by: Tapani Pälli Reviewed-by: Martin Peres Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90925 (cherry picked from commit f045b8b2ff5ac75da3e092f482fd1717571d8462) --- src/glsl/linker.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/glsl') diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 5ce28c705a8..c2187589655 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -3235,10 +3235,6 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) } } - build_program_resource_list(ctx, prog); - if (!prog->LinkStatus) - goto done; - /* FINISHME: Assign fragment shader output locations. */ done: -- cgit v1.2.3