[Mesa-dev] [PATCH 6/8] mesa: move variable declaration to where its used

Emil Velikov emil.l.velikov at gmail.com
Thu Jan 26 13:18:41 UTC 2017


From: Emil Velikov <emil.velikov at collabora.com>

The variable replacement was unused when building w/o
ENABLE_SHADER_CACHE. Since we can mix variable declarations and code,
move it to where its used.

Fixes: 9f8dc3bf03e "utils: build sha1/disk cache only with
Android/Autoconf"
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 src/mesa/main/shaderapi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 3313fa215b..272aa5153c 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1768,8 +1768,6 @@ _mesa_ShaderSource(GLuint shaderObj, GLsizei count,
    GLcharARB *source;
    struct gl_shader *sh;
 
-   GLcharARB *replacement;
-
    sh = _mesa_lookup_shader_err(ctx, shaderObj, "glShaderSourceARB");
    if (!sh)
       return;
@@ -1826,6 +1824,8 @@ _mesa_ShaderSource(GLuint shaderObj, GLsizei count,
    source[totalLength - 2] = '\0';
 
 #ifdef ENABLE_SHADER_CACHE
+   GLcharARB *replacement;
+
    /* Dump original shader source to MESA_SHADER_DUMP_PATH and replace
     * if corresponding entry found from MESA_SHADER_READ_PATH.
     */
-- 
2.11.0



More information about the mesa-dev mailing list