Module: Mesa Branch: main Commit: e3ff5a3b0eeda3befc55d1fa660ed51f744ac38e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3ff5a3b0eeda3befc55d1fa660ed51f744ac38e
Author: Faith Ekstrand <[email protected]> Date: Mon Aug 21 18:11:21 2023 -0500 intel/vec4: Use MESA_PRIM_* instead of GL_* Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24821> --- src/intel/compiler/brw_fs_nir.cpp | 2 +- src/intel/compiler/brw_vec4_gs_visitor.cpp | 2 +- src/intel/compiler/gfx6_gs_visitor.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index fa37d377961..afb6a499327 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -2419,7 +2419,7 @@ fs_visitor::emit_gs_vertex(const nir_src &vertex_count_nir_src, /* In stream mode we have to set control data bits for all vertices * unless we have disabled control data bits completely (which we do - * do for GL_POINTS outputs that don't use streams). + * do for MESA_PRIM_POINTS outputs that don't use streams). */ if (gs_compile->control_data_header_size_bits > 0 && gs_prog_data->control_data_format == diff --git a/src/intel/compiler/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp index 68e5e908cfa..02600e6213d 100644 --- a/src/intel/compiler/brw_vec4_gs_visitor.cpp +++ b/src/intel/compiler/brw_vec4_gs_visitor.cpp @@ -496,7 +496,7 @@ vec4_gs_visitor::gs_emit_vertex(int stream_id) /* In stream mode we have to set control data bits for all vertices * unless we have disabled control data bits completely (which we do - * do for GL_POINTS outputs that don't use streams). + * do for MESA_PRIM_POINTS outputs that don't use streams). */ if (c->control_data_header_size_bits > 0 && gs_prog_data->control_data_format == diff --git a/src/intel/compiler/gfx6_gs_visitor.cpp b/src/intel/compiler/gfx6_gs_visitor.cpp index c1ff14ae498..9453a80b0ca 100644 --- a/src/intel/compiler/gfx6_gs_visitor.cpp +++ b/src/intel/compiler/gfx6_gs_visitor.cpp @@ -322,7 +322,7 @@ gfx6_gs_visitor::emit_thread_end() * first_vertex is not zero. This is only relevant for outputs other than * points because in the point case we set PrimEnd on all vertices. */ - if (nir->info.gs.output_primitive != GL_POINTS) { + if (nir->info.gs.output_primitive != MESA_PRIM_POINTS) { emit(CMP(dst_null_ud(), this->first_vertex, brw_imm_ud(0u), BRW_CONDITIONAL_Z)); emit(IF(BRW_PREDICATE_NORMAL)); gs_end_primitive();
