From e5209e6a95d50b5b9f9fe282f87e8e424ccdd6d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 30 Sep 2019 22:16:55 -0400 Subject: [PATCH] nir/drawpixels: fix what appears to be a copy-paste bug in get_texcoord_const Reviewed-by: Timothy Arceri Reviewed-by: Kenneth Graunke --- src/compiler/nir/nir_lower_drawpixels.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c index c0da1a4..f2e6472 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -35,7 +35,7 @@ typedef struct { const nir_lower_drawpixels_options *options; nir_shader *shader; nir_builder b; - nir_variable *texcoord, *scale, *bias, *tex, *pixelmap; + nir_variable *texcoord, *texcoord_const, *scale, *bias, *tex, *pixelmap; } lower_drawpixels_state; static nir_ssa_def * @@ -104,11 +104,12 @@ get_bias(lower_drawpixels_state *state) static nir_ssa_def * get_texcoord_const(lower_drawpixels_state *state) { - if (state->bias == NULL) { - state->bias = create_uniform(state->shader, "gl_MultiTexCoord0", + if (state->texcoord_const == NULL) { + state->texcoord_const = create_uniform(state->shader, + "gl_MultiTexCoord0", state->options->texcoord_state_tokens); } - return nir_load_var(&state->b, state->bias); + return nir_load_var(&state->b, state->texcoord_const); } static void -- 2.7.4