Module: Mesa Branch: main Commit: 12256136e0c9652d84270469409dce78b86812fc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=12256136e0c9652d84270469409dce78b86812fc
Author: Yonggang Luo <[email protected]> Date: Thu Jun 1 23:03:34 2023 +0800 compiler: Rename shader_prim to mesa_prim and replace all usage of pipe_prim_type with mesa_prim This is a prepare step to remove depends on p_defines.h in src/util/* This is done by: replace pipe_prim_type with mesa_prim replace shader_prim with mesa_prim replace PIPE_PRIM_MAX with MESA_PRIM_COUNT replace SHADER_PRIM_ with MESA_PRIM_ replace PIPE_PRIM_ with MESA_PRIM_ This patch only replace code only Signed-off-by: Yonggang Luo <[email protected]> Acked-by: Marek Olšák <[email protected]> Acked-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23369> --- src/amd/common/ac_nir.c | 6 +- src/amd/common/ac_nir_lower_ngg.c | 6 +- src/amd/vulkan/nir/radv_nir_lower_abi.c | 6 +- src/amd/vulkan/radv_pipeline_graphics.c | 20 +- src/amd/vulkan/radv_shader.c | 6 +- src/amd/vulkan/radv_shader.h | 2 +- src/amd/vulkan/radv_shader_info.c | 16 +- src/broadcom/common/v3d_util.c | 26 +-- src/broadcom/common/v3d_util.h | 2 +- src/broadcom/vulkan/v3dv_meta_clear.c | 4 +- src/broadcom/vulkan/v3dv_meta_copy.c | 4 +- src/broadcom/vulkan/v3dv_pipeline.c | 80 +++---- src/broadcom/vulkan/v3dv_private.h | 2 +- src/broadcom/vulkan/v3dvx_cmd_buffer.c | 8 +- src/broadcom/vulkan/v3dvx_pipeline.c | 2 +- src/compiler/glsl/glsl_parser_extras.cpp | 8 +- src/compiler/glsl/linker.cpp | 20 +- src/compiler/nir/nir.h | 2 +- src/compiler/nir/nir_lower_gs_intrinsics.c | 10 +- src/compiler/nir/nir_passthrough_gs.c | 128 +++++------ src/compiler/nir/nir_print.c | 2 +- src/compiler/shader_enums.c | 6 +- src/compiler/shader_enums.h | 42 ++-- src/compiler/spirv/spirv_to_nir.c | 18 +- src/freedreno/vulkan/tu_pipeline.cc | 10 +- src/gallium/auxiliary/draw/draw_context.c | 2 +- src/gallium/auxiliary/draw/draw_context.h | 2 +- src/gallium/auxiliary/draw/draw_decompose_tmp.h | 30 +-- src/gallium/auxiliary/draw/draw_gs_tmp.h | 6 +- src/gallium/auxiliary/draw/draw_llvm.c | 2 +- src/gallium/auxiliary/draw/draw_pipe.c | 4 +- src/gallium/auxiliary/draw/draw_pipe_validate.c | 8 +- src/gallium/auxiliary/draw/draw_pipe_vbuf.c | 6 +- src/gallium/auxiliary/draw/draw_prim_assembler.c | 18 +- .../auxiliary/draw/draw_prim_assembler_tmp.h | 4 +- src/gallium/auxiliary/draw/draw_private.h | 4 +- src/gallium/auxiliary/draw/draw_pt.c | 8 +- src/gallium/auxiliary/draw/draw_pt.h | 8 +- src/gallium/auxiliary/draw/draw_pt_emit.c | 2 +- .../auxiliary/draw/draw_pt_fetch_shade_emit.c | 2 +- .../auxiliary/draw/draw_pt_fetch_shade_pipeline.c | 8 +- .../draw/draw_pt_fetch_shade_pipeline_llvm.c | 18 +- src/gallium/auxiliary/draw/draw_pt_util.c | 30 +-- src/gallium/auxiliary/draw/draw_pt_vsplit.c | 4 +- src/gallium/auxiliary/draw/draw_pt_vsplit_tmp.h | 4 +- src/gallium/auxiliary/draw/draw_so_emit_tmp.h | 10 +- src/gallium/auxiliary/draw/draw_split_tmp.h | 36 +-- src/gallium/auxiliary/draw/draw_tess.c | 12 +- src/gallium/auxiliary/draw/draw_tess.h | 4 +- src/gallium/auxiliary/draw/draw_vbuf.h | 2 +- src/gallium/auxiliary/hud/hud_context.c | 12 +- src/gallium/auxiliary/indices/u_indices.c | 124 +++++------ src/gallium/auxiliary/indices/u_indices.h | 24 +- src/gallium/auxiliary/indices/u_indices_gen.py | 28 +-- src/gallium/auxiliary/indices/u_indices_priv.h | 2 +- src/gallium/auxiliary/indices/u_primconvert.c | 6 +- src/gallium/auxiliary/indices/u_unfilled_gen.py | 16 +- src/gallium/auxiliary/indices/u_unfilled_indices.c | 40 ++-- src/gallium/auxiliary/postprocess/pp_run.c | 2 +- .../auxiliary/tessellator/p_tessellator.cpp | 14 +- src/gallium/auxiliary/tessellator/p_tessellator.h | 2 +- src/gallium/auxiliary/tgsi/tgsi_point_sprite.c | 2 +- src/gallium/auxiliary/tgsi/tgsi_strings.c | 4 +- src/gallium/auxiliary/tgsi/tgsi_strings.h | 2 +- src/gallium/auxiliary/tgsi/tgsi_text.c | 2 +- src/gallium/auxiliary/util/u_blitter.c | 6 +- src/gallium/auxiliary/util/u_draw.h | 8 +- src/gallium/auxiliary/util/u_dump_defines.c | 30 +-- src/gallium/auxiliary/util/u_prim.c | 32 +-- src/gallium/auxiliary/util/u_prim.h | 244 ++++++++++----------- src/gallium/auxiliary/util/u_prim_restart.c | 2 +- src/gallium/auxiliary/util/u_screen.c | 2 +- src/gallium/auxiliary/util/u_simple_shaders.c | 4 +- src/gallium/auxiliary/util/u_split_draw.c | 12 +- src/gallium/auxiliary/util/u_split_prim.h | 22 +- src/gallium/auxiliary/util/u_tests.c | 6 +- src/gallium/auxiliary/util/u_vbuf.c | 10 +- src/gallium/auxiliary/vl/vl_bicubic_filter.c | 2 +- src/gallium/auxiliary/vl/vl_compositor_gfx.c | 2 +- src/gallium/auxiliary/vl/vl_deint_filter.c | 6 +- src/gallium/auxiliary/vl/vl_idct.c | 4 +- src/gallium/auxiliary/vl/vl_matrix_filter.c | 2 +- src/gallium/auxiliary/vl/vl_mc.c | 6 +- src/gallium/auxiliary/vl/vl_median_filter.c | 2 +- src/gallium/auxiliary/vl/vl_zscan.c | 2 +- src/gallium/drivers/asahi/agx_batch.c | 2 +- src/gallium/drivers/asahi/agx_pipe.c | 14 +- src/gallium/drivers/asahi/agx_state.c | 28 +-- src/gallium/drivers/asahi/agx_state.h | 4 +- src/gallium/drivers/asahi/agx_streamout.c | 26 +-- src/gallium/drivers/crocus/crocus_context.h | 4 +- src/gallium/drivers/crocus/crocus_draw.c | 44 ++-- src/gallium/drivers/crocus/crocus_program.c | 8 +- src/gallium/drivers/crocus/crocus_screen.h | 2 +- src/gallium/drivers/crocus/crocus_state.c | 44 ++-- src/gallium/drivers/d3d12/d3d12_compiler.cpp | 26 +-- src/gallium/drivers/d3d12/d3d12_context.cpp | 10 +- src/gallium/drivers/d3d12/d3d12_context.h | 2 +- src/gallium/drivers/d3d12/d3d12_draw.cpp | 70 +++--- src/gallium/drivers/d3d12/d3d12_pipeline_state.cpp | 24 +- src/gallium/drivers/d3d12/d3d12_pipeline_state.h | 2 +- src/gallium/drivers/etnaviv/etnaviv_context.c | 2 +- src/gallium/drivers/etnaviv/etnaviv_screen.c | 14 +- src/gallium/drivers/etnaviv/etnaviv_translate.h | 16 +- src/gallium/drivers/freedreno/a2xx/fd2_draw.c | 16 +- src/gallium/drivers/freedreno/a2xx/fd2_screen.c | 30 +-- src/gallium/drivers/freedreno/a3xx/fd3_draw.c | 4 +- src/gallium/drivers/freedreno/a3xx/fd3_screen.c | 16 +- src/gallium/drivers/freedreno/a4xx/fd4_draw.c | 4 +- src/gallium/drivers/freedreno/a4xx/fd4_screen.c | 16 +- src/gallium/drivers/freedreno/a5xx/fd5_screen.c | 16 +- src/gallium/drivers/freedreno/a6xx/fd6_draw.cc | 6 +- src/gallium/drivers/freedreno/a6xx/fd6_program.cc | 6 +- src/gallium/drivers/freedreno/a6xx/fd6_screen.cc | 32 +-- src/gallium/drivers/freedreno/a6xx/fd6_vsc.cc | 4 +- src/gallium/drivers/freedreno/freedreno_blitter.c | 2 +- src/gallium/drivers/freedreno/freedreno_draw.c | 4 +- src/gallium/drivers/freedreno/freedreno_screen.c | 2 +- src/gallium/drivers/freedreno/freedreno_screen.h | 2 +- src/gallium/drivers/i915/i915_prim_vbuf.c | 52 ++--- src/gallium/drivers/iris/iris_context.h | 2 +- src/gallium/drivers/iris/iris_draw.c | 10 +- src/gallium/drivers/iris/iris_state.c | 58 ++--- src/gallium/drivers/lima/lima_draw.c | 16 +- src/gallium/drivers/llvmpipe/lp_setup_context.h | 2 +- src/gallium/drivers/llvmpipe/lp_setup_vbuf.c | 42 ++-- src/gallium/drivers/nouveau/nouveau_gldefs.h | 20 +- src/gallium/drivers/nouveau/nv30/nv30_context.h | 2 +- src/gallium/drivers/nouveau/nv30/nv30_draw.c | 2 +- src/gallium/drivers/nouveau/nv30/nv30_screen.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_program.c | 8 +- src/gallium/drivers/nouveau/nv50/nv50_push.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_vbo.c | 32 +-- src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 22 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c | 4 +- .../drivers/nouveau/nvc0/nvc0_vbo_translate.c | 2 +- src/gallium/drivers/panfrost/pan_cmdstream.c | 30 +-- src/gallium/drivers/panfrost/pan_context.c | 2 +- src/gallium/drivers/panfrost/pan_context.h | 2 +- src/gallium/drivers/panfrost/pan_screen.c | 8 +- src/gallium/drivers/panfrost/pan_shader.c | 2 +- src/gallium/drivers/r300/r300_render.c | 18 +- src/gallium/drivers/r600/evergreen_state.c | 8 +- src/gallium/drivers/r600/r600_pipe.h | 8 +- src/gallium/drivers/r600/r600_pipe_common.h | 2 +- src/gallium/drivers/r600/r600_state_common.c | 78 +++---- src/gallium/drivers/r600/sfn/sfn_nir.cpp | 6 +- src/gallium/drivers/r600/sfn/sfn_nir.h | 6 +- .../drivers/r600/sfn/sfn_nir_lower_tess_io.cpp | 22 +- src/gallium/drivers/radeonsi/gfx10_shader_ngg.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.h | 22 +- src/gallium/drivers/radeonsi/si_shader.h | 2 +- src/gallium/drivers/radeonsi/si_shader_info.c | 2 +- src/gallium/drivers/radeonsi/si_state_draw.cpp | 80 +++---- src/gallium/drivers/radeonsi/si_state_shaders.cpp | 34 +-- src/gallium/drivers/radeonsi/si_state_viewport.c | 2 +- src/gallium/drivers/softpipe/sp_clear.c | 2 +- src/gallium/drivers/softpipe/sp_prim_vbuf.c | 52 ++--- src/gallium/drivers/softpipe/sp_setup.c | 8 +- src/gallium/drivers/svga/svga_context.h | 10 +- src/gallium/drivers/svga/svga_draw.c | 2 +- src/gallium/drivers/svga/svga_draw.h | 2 +- src/gallium/drivers/svga/svga_draw_arrays.c | 20 +- src/gallium/drivers/svga/svga_draw_elements.c | 12 +- src/gallium/drivers/svga/svga_draw_private.h | 64 +++--- src/gallium/drivers/svga/svga_pipe_draw.c | 22 +- src/gallium/drivers/svga/svga_resource_buffer.h | 2 +- src/gallium/drivers/svga/svga_shader.h | 10 +- src/gallium/drivers/svga/svga_state_framebuffer.c | 2 +- src/gallium/drivers/svga/svga_state_fs.c | 6 +- src/gallium/drivers/svga/svga_state_need_swtnl.c | 8 +- src/gallium/drivers/svga/svga_state_rss.c | 2 +- .../drivers/svga/svga_state_tgsi_transform.c | 2 +- src/gallium/drivers/svga/svga_swtnl_backend.c | 2 +- src/gallium/drivers/svga/svga_swtnl_private.h | 2 +- src/gallium/drivers/svga/svga_swtnl_state.c | 8 +- src/gallium/drivers/svga/svga_tgsi_vgpu10.c | 130 +++++------ src/gallium/drivers/v3d/v3d_context.c | 2 +- src/gallium/drivers/v3d/v3d_program.c | 10 +- src/gallium/drivers/v3d/v3d_screen.c | 22 +- src/gallium/drivers/v3d/v3dx_draw.c | 10 +- src/gallium/drivers/v3d/v3dx_emit.c | 2 +- src/gallium/drivers/vc4/vc4_draw.c | 6 +- src/gallium/drivers/vc4/vc4_program.c | 8 +- src/gallium/drivers/vc4/vc4_screen.c | 14 +- src/gallium/drivers/virgl/virgl_encode.c | 2 +- src/gallium/drivers/virgl/virgl_screen.c | 6 +- .../drivers/zink/nir_to_spirv/nir_to_spirv.c | 62 +++--- src/gallium/drivers/zink/zink_compiler.c | 16 +- src/gallium/drivers/zink/zink_context.c | 2 +- src/gallium/drivers/zink/zink_draw.cpp | 34 +-- src/gallium/drivers/zink/zink_pipeline.c | 4 +- src/gallium/drivers/zink/zink_program.c | 120 +++++----- src/gallium/drivers/zink/zink_program.h | 38 ++-- src/gallium/drivers/zink/zink_program_state.hpp | 4 +- src/gallium/drivers/zink/zink_screen.c | 32 +-- src/gallium/drivers/zink/zink_types.h | 6 +- src/gallium/frontends/d3d10umd/Draw.cpp | 10 +- src/gallium/frontends/d3d10umd/InputAssembly.cpp | 24 +- src/gallium/frontends/d3d10umd/ShaderTGSI.c | 16 +- src/gallium/frontends/d3d10umd/State.h | 2 +- src/gallium/frontends/lavapipe/lvp_conv.h | 22 +- src/gallium/frontends/lavapipe/lvp_execute.c | 4 +- src/gallium/frontends/nine/device9.c | 2 +- src/gallium/frontends/nine/nine_pipe.h | 14 +- src/gallium/frontends/xa/xa_renderer.c | 4 +- src/gallium/include/pipe/p_defines.h | 22 -- src/gallium/include/pipe/p_state.h | 6 +- src/gallium/tests/trivial/quad-tex.c | 2 +- src/gallium/tests/trivial/tri.c | 2 +- src/gallium/tests/unit/u_prim_verts_test.c | 26 +-- src/intel/compiler/brw_compile_clip.c | 6 +- src/intel/compiler/brw_vec4_gs_visitor.cpp | 32 +-- src/intel/vulkan/genX_pipeline.c | 10 +- src/mesa/main/shader_types.h | 4 +- src/mesa/main/shaderobj.c | 4 +- src/mesa/state_tracker/st_cb_drawtex.c | 2 +- src/mesa/state_tracker/st_cb_rasterpos.c | 2 +- src/mesa/state_tracker/st_context.c | 2 +- src/mesa/state_tracker/st_draw.c | 12 +- src/mesa/state_tracker/st_draw_hw_select.c | 10 +- src/mesa/state_tracker/st_pbo.c | 8 +- src/mesa/vbo/vbo_save_api.c | 6 +- src/microsoft/compiler/dxil_enums.c | 18 +- src/microsoft/vulkan/dzn_nir.c | 4 +- src/nouveau/codegen/nv50_ir.cpp | 4 +- src/nouveau/codegen/nv50_ir_driver.h | 4 +- src/nouveau/codegen/nv50_ir_from_nir.cpp | 2 +- src/nouveau/codegen/nv50_ir_from_tgsi.cpp | 4 +- src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 2 +- 232 files changed, 1757 insertions(+), 1777 deletions(-) Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=12256136e0c9652d84270469409dce78b86812fc
