fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

compiler,gallium: remove PIPE_SHADER_* and adjust some macro usage
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
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 17:46:22 +08:00
parent c135ed1eb9
commit b22806705c
4 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/shader_enums.h
View file

@ -52,25 +52,15 @@ extern "C" {
typedef enum mesa_shader_stage {
MESA_SHADER_NONE = -1,
MESA_SHADER_VERTEX = 0,
PIPE_SHADER_VERTEX = MESA_SHADER_VERTEX,
MESA_SHADER_TESS_CTRL = 1,
PIPE_SHADER_TESS_CTRL = MESA_SHADER_TESS_CTRL,
MESA_SHADER_TESS_EVAL = 2,
PIPE_SHADER_TESS_EVAL = MESA_SHADER_TESS_EVAL,
MESA_SHADER_GEOMETRY = 3,
PIPE_SHADER_GEOMETRY = MESA_SHADER_GEOMETRY,
MESA_SHADER_FRAGMENT = 4,
PIPE_SHADER_FRAGMENT = MESA_SHADER_FRAGMENT,
MESA_SHADER_COMPUTE = 5,
PIPE_SHADER_COMPUTE = MESA_SHADER_COMPUTE,
PIPE_SHADER_TYPES = (MESA_SHADER_COMPUTE + 1),
/* Vulkan-only stages. */
MESA_SHADER_TASK = 6,
PIPE_SHADER_TASK = MESA_SHADER_TASK,
MESA_SHADER_MESH = 7,
PIPE_SHADER_MESH = MESA_SHADER_MESH,
PIPE_SHADER_MESH_TYPES = (MESA_SHADER_MESH + 1),
MESA_SHADER_RAYGEN = 8,
MESA_SHADER_ANY_HIT = 9,

2
src/gallium/auxiliary/driver_ddebug/dd_context.c
View file

@ -271,7 +271,7 @@ DD_CSO_DELETE(vertex_elements)
struct pipe_context *pipe = dctx->pipe; \
struct dd_state *hstate = state; \
\
dctx->draw_state.shaders[PIPE_SHADER_##NAME] = hstate; \
dctx->draw_state.shaders[MESA_SHADER_##NAME] = hstate; \
pipe->bind_##name##_state(pipe, hstate ? hstate->cso : NULL); \
} \
\

2
src/gallium/drivers/nouveau/codegen/nv50_ir.cpp
View file

@ -1275,7 +1275,7 @@ nv50_ir_generate_code(struct nv50_ir_prog_info *info,
nv50_ir_init_prog_info(info, info_out);
#define PROG_TYPE_CASE(a, b) \
case PIPE_SHADER_##a: type = nv50_ir::Program::TYPE_##b; break
case MESA_SHADER_##a: type = nv50_ir::Program::TYPE_##b; break
switch (info->type) {
PROG_TYPE_CASE(VERTEX, VERTEX);

2
src/gallium/drivers/radeonsi/si_state.h
View file

@ -501,7 +501,7 @@ enum
#define SI_NUM_DESCS (SI_DESCS_FIRST_SHADER + SI_NUM_SHADERS * SI_NUM_SHADER_DESCS)
#define SI_DESCS_SHADER_MASK(name) \
BITFIELD_RANGE(SI_DESCS_FIRST_SHADER + PIPE_SHADER_##name * SI_NUM_SHADER_DESCS, \
BITFIELD_RANGE(SI_DESCS_FIRST_SHADER + MESA_SHADER_##name * SI_NUM_SHADER_DESCS, \
SI_NUM_SHADER_DESCS)
static inline unsigned si_const_and_shader_buffer_descriptors_idx(unsigned shader)