commit 1e03b5e5660b4deea16121e5da35d0d1a5aa755e
author Emil Velikov <emil.velikov@collabora.com> Thu Jan 26 13:18:41 2017 +0000
committer Emil Velikov <emil.l.velikov@gmail.com> Fri Feb 03 11:08:56 2017 +0000
tree 628830c329129959effc294a25f9b39574e1208b
parent 58952675f6d4e6c5f11d9d481e9ab09391be12bc

mesa: move variable declaration to where its used

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@collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

(cherry picked from commit 6a5850b04a86c2287112047c6cad500136d18df5)

src/mesa/main/shaderapi.c

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 4c67f95..dcc08c7 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1741,8 +1741,6 @@
    GLcharARB *source;
    struct gl_shader *sh;
 
-   GLcharARB *replacement;
-
    sh = _mesa_lookup_shader_err(ctx, shaderObj, "glShaderSourceARB");
    if (!sh)
       return;
@@ -1799,6 +1797,8 @@
    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.
     */