From 42b444ca1836633cc0791b7d65577e0bbfddcc6a Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Wed, 23 Aug 2017 17:09:09 +0200 Subject: st/glsl_to_tgsi: ir_load_ubo always has a second index MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Roland Scheidegger Tested-by: Dieter Nützel Reviewed-by: Timothy Arceri --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/mesa/state_tracker') diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 95c2f85b4cc..58cae301660 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -2186,14 +2186,13 @@ glsl_to_tgsi_visitor::visit_expression(ir_expression* ir, st_src_reg *op) if (const_uniform_block) { /* Constant constant buffer */ cbuf.reladdr2 = NULL; - cbuf.has_index2 = true; } else { /* Relative/variable constant buffer */ cbuf.reladdr2 = ralloc(mem_ctx, st_src_reg); memcpy(cbuf.reladdr2, &op[0], sizeof(st_src_reg)); - cbuf.has_index2 = true; } + cbuf.has_index2 = true; cbuf.swizzle = swizzle_for_size(ir->type->vector_elements); if (glsl_base_type_is_64bit(cbuf.type)) -- cgit v1.2.3