From c858d3083302784abbd9efa89a39105df287d86a Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 10 Aug 2021 14:33:08 -0500 Subject: [PATCH] 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 Reviewed-by: Kristian H. Kristensen Part-of: --- 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 a7f3490..ef605bc 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 99723b6..3a397cf 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; -- 2.7.4