diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-07-27 15:37:15 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-07-30 10:10:27 -0700 |
| commit | 1299694ed5e3c2f51c076b020a9ad2fef2e1d059 (patch) | |
| tree | 789d570c372cab8bf0804a52c45e55a91a971c7e | |
| parent | 5fe6b90c87c055fdfe24eb8b2075e6725ad59ecd (diff) | |
| download | external_mesa3d-1299694ed5e3c2f51c076b020a9ad2fef2e1d059.zip external_mesa3d-1299694ed5e3c2f51c076b020a9ad2fef2e1d059.tar.gz external_mesa3d-1299694ed5e3c2f51c076b020a9ad2fef2e1d059.tar.bz2 | |
glsl: Remove redundant writes to prog->LinkStatus
The linker_error() function sets prog->LinkStatus to false. There's
no reason for the caller of linker_error() to also do so.
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
| -rw-r--r-- | src/glsl/ir_function_detect_recursion.cpp | 1 | ||||
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/glsl/ir_function_detect_recursion.cpp b/src/glsl/ir_function_detect_recursion.cpp index 5df3ac5..280c473 100644 --- a/src/glsl/ir_function_detect_recursion.cpp +++ b/src/glsl/ir_function_detect_recursion.cpp @@ -319,7 +319,6 @@ emit_errors_linked(const void *key, void *data, void *closure) linker_error(prog, "function `%s' has static recursion.\n", proto); ralloc_free(proto); - prog->LinkStatus = false; } diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 4af1c82..f0fc1b9 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3108,7 +3108,6 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) for (i = 0; i < prog->NumShaders; i++) { if (!prog->Shaders[i]->CompileStatus) { linker_error(prog, "linking with uncompiled shader"); - prog->LinkStatus = GL_FALSE; } } |