Mesa (master): mesa: Move declaration to top of block.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu May 1 09:00:27 UTC 2014


Module: Mesa
Branch: master
Commit: 6d911a59446edf3f3261355662d8208d63a42b17
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d911a59446edf3f3261355662d8208d63a42b17

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu May  1 10:00:10 2014 +0100

mesa: Move declaration to top of block.

To fix MSVC build.  Trivial.

---

 src/mesa/main/texstate.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 000af94..91b2906 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -526,6 +526,7 @@ update_single_program_texture(struct gl_context *ctx, struct gl_program *prog,
    gl_texture_index target_index;
    struct gl_texture_unit *texUnit;
    struct gl_texture_object *texObj;
+   struct gl_sampler_object *sampler;
    int unit;
 
    if (!(prog->SamplersUsed & (1 << s)))
@@ -547,7 +548,7 @@ update_single_program_texture(struct gl_context *ctx, struct gl_program *prog,
    target_index = ffs(prog->TexturesUsed[unit]) - 1;
    texObj = texUnit->CurrentTex[target_index];
 
-   struct gl_sampler_object *sampler = texUnit->Sampler ?
+   sampler = texUnit->Sampler ?
       texUnit->Sampler : &texObj->Sampler;
 
    if (likely(texObj)) {




More information about the mesa-commit mailing list