OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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@intel.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12308>
This commit is contained in:
Jason Ekstrand
2021-08-10 14:33:08 -05:00
committed by Marge Bot
parent a4d1ae7017
commit c858d30833
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/compiler/gfx6_gs_visitor.cpp
View File

@@ -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

8
src/intel/compiler/gfx6_gs_visitor.h
View File

@@ -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;