Mesa (master): radeonsi: fix FP64 UBO loads with indirect uniform block indexing

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 15a127bc2c3267f35e0d78ebc205e1686a5a5e3f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=15a127bc2c3267f35e0d78ebc205e1686a5a5e3f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Sep 12 01:38:53 2016 +0200

radeonsi: fix FP64 UBO loads with indirect uniform block indexing

No known tests.

Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/drivers/radeonsi/si_shader.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 6d30d1c..be6fae7 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -1924,8 +1924,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(ctx, ctx->const_buffers[buf],
-					    addr2);
+		result2 = buffer_load_const(ctx, bufp, addr2);
 
 		result = radeon_llvm_emit_fetch_64bit(bld_base, type,
 						      result, result2);