summaryrefslogtreecommitdiffstats
path: root/src/glsl/main.cpp
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2014-10-20 14:40:34 -0700
committerIan Romanick <ian.d.romanick@intel.com>2014-10-24 19:54:38 -0700
commitfefead3b63584603278b3388cc9c426a8a44e92c (patch)
tree7e9063dcc09658f5b81d09e2c16d05e932242d32 /src/glsl/main.cpp
parent7cbcff06069ad88962115b8b5030e08c74f208cf (diff)
downloadexternal_mesa3d-fefead3b63584603278b3388cc9c426a8a44e92c.zip
external_mesa3d-fefead3b63584603278b3388cc9c426a8a44e92c.tar.gz
external_mesa3d-fefead3b63584603278b3388cc9c426a8a44e92c.tar.bz2
linker: Rely on _mesa_clear_shader_program_data to clear link information
_mesa_link_shader_program already calls _mesa_clear_shader_program_data before calling link_shaders, so this is already done. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/glsl/main.cpp')
-rw-r--r--src/glsl/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index feed100..96d3915 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -403,6 +403,8 @@ main(int argc, char **argv)
}
if ((status == EXIT_SUCCESS) && do_link) {
+ _mesa_clear_shader_program_data(ctx, whole_program);
+
link_shaders(ctx, whole_program);
status = (whole_program->LinkStatus) ? EXIT_SUCCESS : EXIT_FAILURE;