From cf23161040c650fc878427686d2452a1cae624f5 Mon Sep 17 00:00:00 2001
From: Gert Wollny <gert.wollny@collabora.com>
Date: Sun, 31 Jan 2021 18:54:29 +0100
Subject: [PATCH] r600/sfn: Use the constant buffer ID when given

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8800>
---
 src/gallium/drivers/r600/sfn/sfn_shader_base.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_base.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_base.cpp
index fdd548d305e..8bf616ef84e 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader_base.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shader_base.cpp
@@ -893,7 +893,7 @@ bool ShaderFromNirProcessor::emit_load_ubo_vec4(nir_intrinsic_instr* instr)
       FetchInstruction *ir;
       if (bufid) {
          ir = new FetchInstruction(vc_fetch, no_index_offset, trgt, addr, 0,
-                                              1, nullptr, bim_none);
+                                              1 + bufid->u32, nullptr, bim_none);
       } else {
          PValue bufid = from_nir(instr->src[0], 0, 0);
          ir = new FetchInstruction(vc_fetch, no_index_offset, trgt, addr, 0,