Module: Mesa
Branch: main
Commit: 4f86353f4fb1cd36473a2b6bce858a3bc41549c3
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f86353f4fb1cd36473a2b6bce858a3bc41549c3

Author: Vitaliy Triang3l Kuzmin <trian...@yandex.ru>
Date:   Mon Nov  6 16:25:15 2023 +0300

r600/sfn: Change sampler_index to texture_index in buffer txs

Signed-off-by: Vitaliy Triang3l Kuzmin <trian...@yandex.ru>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26068>

---

 src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp 
b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
index 8b59f8713f6..1310f835315 100644
--- a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
@@ -677,9 +677,9 @@ TexInstr::emit_tex_txs(nir_tex_instr *tex,
    if (tex->sampler_dim == GLSL_SAMPLER_DIM_BUF) {
       if (shader.chip_class() >= ISA_CC_EVERGREEN) {
          shader.emit_instruction(new QueryBufferSizeInstr(
-            dest, {0, 7, 7, 7}, tex->sampler_index + R600_MAX_CONST_BUFFERS));
+            dest, {0, 7, 7, 7}, tex->texture_index + R600_MAX_CONST_BUFFERS));
       } else {
-         int id = 2 * tex->sampler_index + (512 + R600_BUFFER_INFO_OFFSET / 
16) + 1;
+         int id = 2 * tex->texture_index + (512 + R600_BUFFER_INFO_OFFSET / 
16) + 1;
          auto src = vf.uniform(id, 1, R600_BUFFER_INFO_CONST_BUFFER);
          shader.emit_instruction(
             new AluInstr(op1_mov, dest[0], src, AluInstr::last_write));

Reply via email to