diff options
| author | José Fonseca <[email protected]> | 2014-05-01 10:00:10 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2014-05-01 10:00:10 +0100 |
| commit | 6d911a59446edf3f3261355662d8208d63a42b17 (patch) | |
| tree | 5fdbb3d1a5535a1addc7f2317a680fed5456c79c /src/mesa/main/texstate.c | |
| parent | b0de67ad2d51f16d37f5f5a5822834c34b076c58 (diff) | |
mesa: Move declaration to top of block.
To fix MSVC build. Trivial.
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 000af94c6ed..91b29069169 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)) { |