From 6d911a59446edf3f3261355662d8208d63a42b17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 1 May 2014 10:00:10 +0100 Subject: [PATCH] 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)) { -- 2.7.4