r600/sfn: rename method resource_base to resource_id

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25159>

diff --git a/src/gallium/drivers/r600/sfn/sfn_assembler.cpp b/src/gallium/drivers/r600/sfn/sfn_assembler.cpp
index f7be9e6..9b13aab 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_assembler.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_assembler.cpp
@@ -524,8 +524,8 @@ AssamblerVisitor::visit(const TexInstr& tex_instr)
    r600_bytecode_tex tex;
    memset(&tex, 0, sizeof(struct r600_bytecode_tex));
    tex.op = tex_instr.opcode();
-   tex.sampler_id = tex_instr.resource_base();
-   tex.resource_id = tex_instr.resource_id();
+   tex.sampler_id = tex_instr.resource_id();
+   tex.resource_id = tex_instr.texture_id();
    tex.src_gpr = tex_instr.src().sel();
    tex.dst_gpr = tex_instr.dst().sel();
    tex.dst_sel_x = tex_instr.dest_swizzle(0);
@@ -743,7 +743,7 @@ AssamblerVisitor::visit(const FetchInstr& fetch_instr)
    struct r600_bytecode_vtx vtx;
    memset(&vtx, 0, sizeof(vtx));
    vtx.op = fetch_instr.opcode();
-   vtx.buffer_id = fetch_instr.resource_base();
+   vtx.buffer_id = fetch_instr.resource_id();
    vtx.fetch_type = fetch_instr.fetch_type();
    vtx.src_gpr = fetch_instr.src().sel();
    vtx.src_sel_x = fetch_instr.src().chan();
@@ -841,7 +841,7 @@ AssamblerVisitor::visit(const RatInstr& instr)
 
    EBufferIndexMode index_mode = get_index_mode(instr, 1);
 
-   int rat_idx = instr.resource_base();
+   int rat_idx = instr.resource_id();
 
    memset(&gds, 0, sizeof(struct r600_bytecode_gds));
 
@@ -1012,7 +1012,7 @@ AssamblerVisitor::visit(const GDSInstr& instr)
    memset(&gds, 0, sizeof(struct r600_bytecode_gds));
 
    gds.op = ds_opcode_map.at(instr.opcode());
-   gds.uav_id = instr.resource_base();
+   gds.uav_id = instr.resource_id();
    gds.uav_index_mode = index_mode;
    gds.src_gpr = instr.src().sel();
 
@@ -1240,7 +1240,7 @@ AssamblerVisitor::copy_dst(r600_bytecode_alu_dst& dst, const Register& d, bool w
 EBufferIndexMode AssamblerVisitor::get_index_mode(const Resource& res,
                                                   unsigned idx)
 {
-   EBufferIndexMode index_mode = res.buffer_index_mode();
+   EBufferIndexMode index_mode = res.resource_index_mode();
 
    if (index_mode == bim_none && res.resource_offset())
       index_mode = emit_index_reg(*res.resource_offset(), idx);

diff --git a/src/gallium/drivers/r600/sfn/sfn_instr.h b/src/gallium/drivers/r600/sfn/sfn_instr.h
index e66156b..440533f 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_instr.h
+++ b/src/gallium/drivers/r600/sfn/sfn_instr.h
@@ -303,11 +303,11 @@ public:
       return !m_offset && !other.m_offset;
    }
 
-   auto resource_base() const { return m_base; }
+   auto resource_id() const { return m_base; }
 
    auto resource_offset() const { return m_offset; }
 
-   auto buffer_index_mode() const -> EBufferIndexMode
+   auto resource_index_mode() const -> EBufferIndexMode
    {
       if (!m_offset || !m_offset->has_flag(Register::addr_or_idx))
          return bim_none;

diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_fetch.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_fetch.cpp
index 3b819a3..0eda62d 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_instr_fetch.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_instr_fetch.cpp
@@ -126,7 +126,7 @@ FetchInstr::is_equal_to(const FetchInstr& rhs) const
           m_num_format == rhs.m_num_format && m_endian_swap == rhs.m_endian_swap &&
           m_mega_fetch_count == rhs.m_mega_fetch_count &&
           m_array_base == rhs.m_array_base && m_array_size == rhs.m_array_size &&
-          m_elm_size == rhs.m_elm_size && resource_base() == rhs.resource_base();
+          m_elm_size == rhs.m_elm_size && resource_id() == rhs.resource_id();
 }
 
 bool
@@ -188,7 +188,7 @@ FetchInstr::do_print(std::ostream& os) const
    }
 
    if (m_opcode != vc_read_scratch)
-      os << " RID:" << resource_base();
+      os << " RID:" << resource_id();
 
    print_resource_offset(os);
 

diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_mem.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_mem.cpp
index 1ce19e3..1be52e1 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_instr_mem.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_instr_mem.cpp
@@ -91,7 +91,7 @@ GDSInstr::do_print(std::ostream& os) const
    else
       os << "___";
    os << " " << m_src;
-   os << " BASE:" << resource_base();
+   os << " BASE:" << resource_id();
 
    print_resource_offset(os);
 }
@@ -438,7 +438,7 @@ RatInstr::do_ready() const
 void
 RatInstr::do_print(std::ostream& os) const
 {
-   os << "MEM_RAT RAT " << resource_base();
+   os << "MEM_RAT RAT " << resource_id();
    print_resource_offset(os);
    os << " @" << m_index;
    os << " OP:" << m_rat_op << " " << m_data;

diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
index 93f6d12..dfd8296 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
@@ -111,7 +111,7 @@ TexInstr::is_equal_to(const TexInstr& lhs) const
       if (m_coord_offset[i] != lhs.m_coord_offset[i])
          return false;
    }
-   return m_inst_mode == lhs.m_inst_mode && resource_base() == lhs.resource_base() &&
+   return m_inst_mode == lhs.m_inst_mode && resource_id() == lhs.resource_id() &&
           m_resource_id == lhs.m_resource_id;
 }
 
@@ -159,7 +159,7 @@ TexInstr::do_print(std::ostream& os) const
    os << " : ";
    m_src.print(os);
 
-   os << " RID:" << m_resource_id << " SID:" << resource_base();
+   os << " RID:" << m_resource_id << " SID:" << resource_id();
 
    if (resource_offset())
       os << " SO:" << *resource_offset();

diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_tex.h b/src/gallium/drivers/r600/sfn/sfn_instr_tex.h
index 81176bb..0966f4b 100644 (file)
--- a/src/gallium/drivers/r600/sfn/sfn_instr_tex.h
+++ b/src/gallium/drivers/r600/sfn/sfn_instr_tex.h
@@ -128,7 +128,7 @@ public:
    auto& src() { return m_src; }
 
    unsigned opcode() const { return m_opcode; }
-   unsigned resource_id() const { return m_resource_id; }
+   unsigned texture_id() const { return m_resource_id; }
 
    void set_offset(unsigned index, int32_t val);
    int get_offset(unsigned index) const;

diff --git a/src/gallium/drivers/r600/sfn/tests/sfn_instr_test.cpp b/src/gallium/drivers/r600/sfn/tests/sfn_instr_test.cpp
index ba7a618..7d73e0c 100644 (file)
--- a/src/gallium/drivers/r600/sfn/tests/sfn_instr_test.cpp
+++ b/src/gallium/drivers/r600/sfn/tests/sfn_instr_test.cpp
@@ -414,8 +414,8 @@ TEST_F(InstrTest, test_tex_basic)
       EXPECT_EQ(tex.dest_swizzle(i), i);
    }
 
-   EXPECT_EQ(tex.resource_base(), 1);
-   EXPECT_EQ(tex.resource_id(), 17);
+   EXPECT_EQ(tex.resource_id(), 1);
+   EXPECT_EQ(tex.texture_id(), 17);
 
    EXPECT_TRUE(tex.end_group());
 
@@ -487,8 +487,8 @@ TEST_F(InstrTest, test_tex_gather4)
       EXPECT_EQ(tex.dest_swizzle(i), i);
    }
 
-   EXPECT_EQ(tex.resource_base(), 2);
-   EXPECT_EQ(tex.resource_id(), 19);
+   EXPECT_EQ(tex.resource_id(), 2);
+   EXPECT_EQ(tex.texture_id(), 19);
 
    for (int i = 0; i < 3; ++i)
       EXPECT_EQ(tex.get_offset(i), 0);
@@ -672,7 +672,7 @@ TEST_F(InstrTest, test_fetch_basic)
    EXPECT_EQ(fetch.src(), Register(201, 2, pin_none));
    EXPECT_EQ(fetch.src_offset(), 0);
 
-   EXPECT_EQ(fetch.resource_base(), 1);
+   EXPECT_EQ(fetch.resource_id(), 1);
    EXPECT_FALSE(fetch.resource_offset());
 
    EXPECT_EQ(fetch.fetch_type(), vertex_data);
@@ -879,7 +879,7 @@ TEST_F(InstrTest, test_fetch_basic2)
    EXPECT_EQ(fetch.src(), Register(202, 3, pin_none));
    EXPECT_EQ(fetch.src_offset(), 1);
 
-   EXPECT_EQ(fetch.resource_base(), 3);
+   EXPECT_EQ(fetch.resource_id(), 3);
    EXPECT_EQ(*fetch.resource_offset(), Register(300, 1, pin_none));
 
    EXPECT_EQ(fetch.fetch_type(), no_index_offset);