AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: rename PIPE_SHADER_MESH to MESA_SHADER_MESH

Browse Source 
Use command:
  find . -type f -not -path '*/.git/*' -exec sed -i 's/\bPIPE_SHADER_MESH\b/MESA_SHADER_MESH/g' {} +

Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36569>
This commit is contained in:
Qiang Yu
2025-08-05 14:01:48 +08:00
parent a45620274c
commit 7729920d92
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/shader_enums.h
+1 -1
View File
@@ -71,7 +71,7 @@ typedef enum pipe_shader_type
PIPE_SHADER_TASK = MESA_SHADER_TASK,
MESA_SHADER_MESH = 7,
PIPE_SHADER_MESH = MESA_SHADER_MESH,
PIPE_SHADER_MESH_TYPES = (PIPE_SHADER_MESH + 1),
PIPE_SHADER_MESH_TYPES = (MESA_SHADER_MESH + 1),
MESA_SHADER_RAYGEN = 8,
MESA_SHADER_ANY_HIT = 9,
src/gallium/auxiliary/cso_cache/cso_context.c
+2 -2
View File
@@ -326,7 +326,7 @@ cso_create_context(struct pipe_context *pipe, unsigned flags)
ctx->has_compute_shader = true;
}
}
if (pipe->screen->shader_caps[PIPE_SHADER_MESH].max_instructions > 0) {
if (pipe->screen->shader_caps[MESA_SHADER_MESH].max_instructions > 0) {
ctx->has_task_mesh_shader = true;
}
if (pipe->screen->caps.max_stream_output_buffers != 0) {
@@ -379,7 +379,7 @@ cso_unbind_context(struct cso_context *cso)
if (!ctx->has_compute_shader)
continue;
break;
case PIPE_SHADER_MESH:
case MESA_SHADER_MESH:
case MESA_SHADER_TASK:
if (!ctx->has_task_mesh_shader)
continue;
src/gallium/drivers/llvmpipe/lp_screen.c
+1 -1
View File
@@ -129,7 +129,7 @@ llvmpipe_init_shader_caps(struct pipe_screen *screen)
switch (i) {
case MESA_SHADER_FRAGMENT:
case MESA_SHADER_COMPUTE:
case PIPE_SHADER_MESH:
case MESA_SHADER_MESH:
case MESA_SHADER_TASK:
gallivm_init_shader_caps(caps);
break;
src/gallium/drivers/llvmpipe/lp_state_cs.c
+13 -13
View File
@@ -1281,7 +1281,7 @@ generate_variant(struct llvmpipe_context *lp,
memset(variant, 0, sizeof(*variant));
char module_name[64];
const char *shname = sh_type == PIPE_SHADER_MESH ? "ms" :
const char *shname = sh_type == MESA_SHADER_MESH ? "ms" :
(sh_type == MESA_SHADER_TASK ? "ts" : "cs");
snprintf(module_name, sizeof(module_name), "%s%u_variant%u",
shname, shader->no, shader->variants_created);
@@ -1315,7 +1315,7 @@ generate_variant(struct llvmpipe_context *lp,
lp_jit_init_cs_types(variant);
if (sh_type == PIPE_SHADER_MESH) {
if (sh_type == MESA_SHADER_MESH) {
struct nir_shader *nir = shader->base.ir.nir;
int per_prim_count = util_bitcount64(nir->info.per_primitive_outputs);
int out_count = util_bitcount64(nir->info.outputs_written);
@@ -1969,7 +1969,7 @@ llvmpipe_update_mesh_shader(struct llvmpipe_context *lp)
{
if (!lp->mhs)
return;
struct lp_compute_shader_variant *variant = llvmpipe_update_cs_variant(lp, PIPE_SHADER_MESH, lp->mhs);
struct lp_compute_shader_variant *variant = llvmpipe_update_cs_variant(lp, MESA_SHADER_MESH, lp->mhs);
lp_cs_ctx_set_cs_variant(lp->mesh_ctx, variant);
}
@@ -2337,30 +2337,30 @@ llvmpipe_mesh_update_derived(struct llvmpipe_context *llvmpipe)
{
if (llvmpipe->dirty & LP_NEW_MESH_CONSTANTS) {
lp_csctx_set_cs_constants(llvmpipe->mesh_ctx,
ARRAY_SIZE(llvmpipe->constants[PIPE_SHADER_MESH]),
llvmpipe->constants[PIPE_SHADER_MESH]);
ARRAY_SIZE(llvmpipe->constants[MESA_SHADER_MESH]),
llvmpipe->constants[MESA_SHADER_MESH]);
update_csctx_consts(llvmpipe, llvmpipe->mesh_ctx);
}
if (llvmpipe->dirty & LP_NEW_MESH_SSBOS) {
lp_csctx_set_cs_ssbos(llvmpipe->mesh_ctx,
ARRAY_SIZE(llvmpipe->ssbos[PIPE_SHADER_MESH]),
llvmpipe->ssbos[PIPE_SHADER_MESH]);
ARRAY_SIZE(llvmpipe->ssbos[MESA_SHADER_MESH]),
llvmpipe->ssbos[MESA_SHADER_MESH]);
update_csctx_ssbo(llvmpipe, llvmpipe->mesh_ctx);
}
if (llvmpipe->dirty & LP_NEW_MESH_SAMPLER_VIEW)
lp_csctx_set_sampler_views(llvmpipe->mesh_ctx,
llvmpipe->num_sampler_views[PIPE_SHADER_MESH],
llvmpipe->sampler_views[PIPE_SHADER_MESH]);
llvmpipe->num_sampler_views[MESA_SHADER_MESH],
llvmpipe->sampler_views[MESA_SHADER_MESH]);
if (llvmpipe->dirty & LP_NEW_MESH_SAMPLER)
lp_csctx_set_sampler_state(llvmpipe->mesh_ctx,
llvmpipe->num_samplers[PIPE_SHADER_MESH],
llvmpipe->samplers[PIPE_SHADER_MESH]);
llvmpipe->num_samplers[MESA_SHADER_MESH],
llvmpipe->samplers[MESA_SHADER_MESH]);
if (llvmpipe->dirty & LP_NEW_MESH_IMAGES)
lp_csctx_set_cs_images(llvmpipe->mesh_ctx,
ARRAY_SIZE(llvmpipe->images[PIPE_SHADER_MESH]),
llvmpipe->images[PIPE_SHADER_MESH]);
ARRAY_SIZE(llvmpipe->images[MESA_SHADER_MESH]),
llvmpipe->images[MESA_SHADER_MESH]);
}
src/gallium/drivers/llvmpipe/lp_state_fs.c
+3 -3
View File
@@ -4269,7 +4269,7 @@ llvmpipe_set_constant_buffer(struct pipe_context *pipe,
case MESA_SHADER_TASK:
llvmpipe->dirty |= LP_NEW_TASK_CONSTANTS;
break;
case PIPE_SHADER_MESH:
case MESA_SHADER_MESH:
llvmpipe->dirty |= LP_NEW_MESH_CONSTANTS;
break;
default:
@@ -4321,7 +4321,7 @@ llvmpipe_set_shader_buffers(struct pipe_context *pipe,
case MESA_SHADER_TASK:
llvmpipe->dirty |= LP_NEW_TASK_SSBOS;
break;
case PIPE_SHADER_MESH:
case MESA_SHADER_MESH:
llvmpipe->dirty |= LP_NEW_MESH_SSBOS;
break;
case MESA_SHADER_FRAGMENT:
@@ -4377,7 +4377,7 @@ llvmpipe_set_shader_images(struct pipe_context *pipe,
case MESA_SHADER_TASK:
llvmpipe->dirty |= LP_NEW_TASK_IMAGES;
break;
case PIPE_SHADER_MESH:
case MESA_SHADER_MESH:
llvmpipe->dirty |= LP_NEW_MESH_IMAGES;
break;
default:
src/gallium/drivers/llvmpipe/lp_state_sampler.c
+2 -2
View File
@@ -115,7 +115,7 @@ llvmpipe_bind_sampler_states(struct pipe_context *pipe,
case MESA_SHADER_TASK:
llvmpipe->dirty |= LP_NEW_TASK_SAMPLER;
break;
case PIPE_SHADER_MESH:
case MESA_SHADER_MESH:
llvmpipe->dirty |= LP_NEW_MESH_SAMPLER;
break;
default:
@@ -201,7 +201,7 @@ llvmpipe_set_sampler_views(struct pipe_context *pipe,
case MESA_SHADER_TASK:
llvmpipe->dirty |= LP_NEW_TASK_SAMPLER_VIEW;
break;
case PIPE_SHADER_MESH:
case MESA_SHADER_MESH:
llvmpipe->dirty |= LP_NEW_MESH_SAMPLER_VIEW;
break;
default: