From b1c5719d7b1be2f6fb438252614a2008f54159d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 12 Sep 2016 01:38:53 +0200 Subject: [PATCH] radeonsi: fix FP64 UBO loads with indirect uniform block indexing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No known tests. Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Nicolai Hähnle (cherry picked from commit 15a127bc2c3267f35e0d78ebc205e1686a5a5e3f) [Emil Velikov: resolve trivial conflicts] Signed-off-by: Emil Velikov Conflicts: src/gallium/drivers/radeonsi/si_shader.c --- src/gallium/drivers/radeonsi/si_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index aad7dd04347..5a99b948a25 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1852,7 +1852,7 @@ static LLVMValueRef fetch_constant( addr2 = lp_build_add(&bld_base->uint_bld, addr2, lp_build_const_int32(base->gallivm, idx * 4)); - result2 = buffer_load_const(base->gallivm->builder, ctx->const_buffers[buf], + result2 = buffer_load_const(base->gallivm->builder, bufp, addr2, ctx->f32); result = radeon_llvm_emit_fetch_double(bld_base,