Mesa (main): intel/vec4: Don't override emit_urb_write_opcode for SNB GS

[GitLab Mirror]

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

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Aug 10 14:33:08 2021 -0500

intel/vec4: Don't override emit_urb_write_opcode for SNB GS

The gfx6_gs_visitor overrides emit_urb_write_opcode but with a different
function signature.  This causes warnings with -Woverloaded-virtual.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12308>

---

 src/intel/compiler/gfx6_gs_visitor.cpp | 6 +++---
 src/intel/compiler/gfx6_gs_visitor.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/intel/compiler/gfx6_gs_visitor.cpp b/src/intel/compiler/gfx6_gs_visitor.cpp
index a7f3490cf76..ef605bcf075 100644
--- a/src/intel/compiler/gfx6_gs_visitor.cpp
+++ b/src/intel/compiler/gfx6_gs_visitor.cpp
@@ -285,8 +285,8 @@ align_interleaved_urb_mlen(unsigned mlen)
 }
 
 void
-gfx6_gs_visitor::emit_urb_write_opcode(bool complete, int base_mrf,
-                                       int last_mrf, int urb_offset)
+gfx6_gs_visitor::emit_snb_gs_urb_write_opcode(bool complete, int base_mrf,
+                                              int last_mrf, int urb_offset)
 {
    vec4_instruction *inst = NULL;
 
@@ -430,7 +430,7 @@ gfx6_gs_visitor::emit_thread_end()
             }
 
             complete = slot >= prog_data->vue_map.num_slots;
-            emit_urb_write_opcode(complete, base_mrf, mrf, urb_offset);
+            emit_snb_gs_urb_write_opcode(complete, base_mrf, mrf, urb_offset);
          } while (!complete);
 
          /* Skip over the flags data item so that vertex_output_offset points
diff --git a/src/intel/compiler/gfx6_gs_visitor.h b/src/intel/compiler/gfx6_gs_visitor.h
index 99723b6f881..3a397cf6475 100644
--- a/src/intel/compiler/gfx6_gs_visitor.h
+++ b/src/intel/compiler/gfx6_gs_visitor.h
@@ -55,16 +55,16 @@ protected:
    virtual void gs_emit_vertex(int stream_id);
    virtual void gs_end_primitive();
    virtual void emit_urb_write_header(int mrf);
-   virtual void emit_urb_write_opcode(bool complete,
-                                      int base_mrf,
-                                      int last_mrf,
-                                      int urb_offset);
    virtual void setup_payload();
 
 private:
    void xfb_write();
    void xfb_program(unsigned vertex, unsigned num_verts);
    int get_vertex_output_offset_for_varying(int vertex, int varying);
+   void emit_snb_gs_urb_write_opcode(bool complete,
+                                     int base_mrf,
+                                     int last_mrf,
+                                     int urb_offset);
 
    src_reg vertex_output;
    src_reg vertex_output_offset;