[Mesa-dev] [PATCH 5/5] glsl: Remove redundant writes to prog->LinkStatus

Paul Berry stereotype441 at gmail.com
Sat Jul 27 15:59:40 PDT 2013


The linker_error() function sets prog->LinkStatus to false.  There's
no reason for the caller of linker_error() to also do so.
---
 src/glsl/ir_function_detect_recursion.cpp | 1 -
 src/mesa/program/ir_to_mesa.cpp           | 1 -
 2 files changed, 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;
       }
    }
 
-- 
1.8.3.4



More information about the mesa-dev mailing list