From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 26 Jan 2017 13:18:41 +0000 (+0000)
Subject: mesa: move variable declaration to where its used
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6a5850b04a86c2287112047c6cad500136d18df5;p=mesa.git

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>
---

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 3313fa215b3..272aa5153cb 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.
     */