From 83ca6b9d31005a11380f9dbd1b5531294f5c3e92 Mon Sep 17 00:00:00 2001 From: Charmaine Lee Date: Tue, 18 Jul 2017 16:13:48 -0700 Subject: [PATCH] svga: fix constant indices for texcoord scale factors and texture buffer size This patch fixes the ordering of the constant indices for texcoord scale factor and texture buffer size to match the order they were added to the constant buffer in svga_get_extra_constants_common(). Tested with MTT piglit, glretrace. Reviewed-by: Brian Paul --- src/gallium/drivers/svga/svga_tgsi_vgpu10.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c index 93a76ef49f1..71dafe75d18 100644 --- a/src/gallium/drivers/svga/svga_tgsi_vgpu10.c +++ b/src/gallium/drivers/svga/svga_tgsi_vgpu10.c @@ -2881,17 +2881,14 @@ emit_constant_declaration(struct svga_shader_emitter_v10 *emit) } } - /* Texcoord scale factors for RECT textures */ - { - for (i = 0; i < emit->num_samplers; i++) { - if (emit->key.tex[i].unnormalized) { - emit->texcoord_scale_index[i] = total_consts++; - } + for (i = 0; i < emit->num_samplers; i++) { + + /* Texcoord scale factors for RECT textures */ + if (emit->key.tex[i].unnormalized) { + emit->texcoord_scale_index[i] = total_consts++; } - } - /* Texture buffer sizes */ - for (i = 0; i < emit->num_samplers; i++) { + /* Texture buffer sizes */ if (emit->sampler_target[i] == TGSI_TEXTURE_BUFFER) { emit->texture_buffer_size_index[i] = total_consts++; } -- 2.30.2