diff options
author | Marek Olšák <[email protected]> | 2015-10-05 23:15:59 +0200 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2016-02-11 16:56:28 +0100 |
commit | 906ecab450e21cc0554a39f846d374aedb72b428 (patch) | |
tree | 241a332f9edbed5d72bf782424b6ad9326c0a593 /src/mesa/program | |
parent | 0f235c960c8a564ff8817835716e8f377b2f5f16 (diff) |
mesa: call build_program_resource_list inside Driver.LinkShader
to allow LinkShader to free the GLSL IR.
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/program')
-rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index a5e32746362..bbc7a7d3b4e 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -31,6 +31,7 @@ #include <stdio.h> #include "main/compiler.h" +#include "main/macros.h" #include "main/mtypes.h" #include "main/shaderapi.h" #include "main/shaderobj.h" @@ -3007,6 +3008,7 @@ _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) _mesa_reference_program(ctx, &linked_prog, NULL); } + build_program_resource_list(prog); return prog->LinkStatus; } @@ -3035,8 +3037,6 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) if (prog->LinkStatus) { if (!ctx->Driver.LinkShader(ctx, prog)) { prog->LinkStatus = GL_FALSE; - } else { - build_program_resource_list(prog); } } |