fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 11:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/tgsi: reorder pipe shader type defines.

Browse source 
Line these up with Mesa, prepare for fallout.

zink: the one where Mike gets overfriendly with enum layouts.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17747>
This commit is contained in:
Dave Airlie 2022-07-26 08:16:00 +10:00 • committed by Marge Bot
parent 9bbf235fd9
commit 27f46465c7
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/auxiliary/tgsi/tgsi_strings.c
View file

@ -35,10 +35,10 @@
const char *tgsi_processor_type_names[6] = const char *tgsi_processor_type_names[6] =
{ {
"VERT", "VERT",
"FRAG",
"GEOM",
"TESS_CTRL", "TESS_CTRL",
"TESS_EVAL", "TESS_EVAL",
"GEOM",
"FRAG",
"COMP" "COMP"
}; };

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

@ -33,7 +33,7 @@
extern "C" { extern "C" {
#endif #endif
#define SI_NUM_GRAPHICS_SHADERS (PIPE_SHADER_TESS_EVAL + 1) #define SI_NUM_GRAPHICS_SHADERS (PIPE_SHADER_FRAGMENT + 1)
#define SI_NUM_SHADERS (PIPE_SHADER_COMPUTE + 1) #define SI_NUM_SHADERS (PIPE_SHADER_COMPUTE + 1)
#define SI_NUM_VERTEX_BUFFERS SI_MAX_ATTRIBS #define SI_NUM_VERTEX_BUFFERS SI_MAX_ATTRIBS

4
src/gallium/drivers/zink/zink_context.h
View file

@ -418,7 +418,9 @@ zink_fb_clear_enabled(const struct zink_context *ctx, unsigned idx)
static inline uint32_t static inline uint32_t
zink_program_cache_stages(uint32_t stages_present) zink_program_cache_stages(uint32_t stages_present)
{ {
return stages_present >> 2; return (stages_present & ((1 << PIPE_SHADER_TESS_CTRL) |
(1 << PIPE_SHADER_TESS_EVAL) |
(1 << PIPE_SHADER_GEOMETRY))) >> 1;
} }
void void

8
src/gallium/drivers/zink/zink_draw.cpp
View file

@ -1065,10 +1065,10 @@ zink_invalid_launch_grid(struct pipe_context *pctx, const struct pipe_grid_info
} }
#define STAGE_BASE 0 #define STAGE_BASE 0
#define STAGE_BASE_GS 1 #define STAGE_BASE_GS 4
#define STAGE_BASE_TES 4 #define STAGE_BASE_TES 2
#define STAGE_BASE_TES_GS 5 #define STAGE_BASE_TES_GS 6
#define STAGE_BASE_TCS_TES 6 #define STAGE_BASE_TCS_TES 3
#define STAGE_BASE_TCS_TES_GS 7 #define STAGE_BASE_TCS_TES_GS 7
template <unsigned STAGE_MASK> template <unsigned STAGE_MASK>

4
src/gallium/include/pipe/p_defines.h
View file

@ -551,10 +551,10 @@ enum pipe_resource_usage {
*/ */
enum pipe_shader_type { enum pipe_shader_type {
PIPE_SHADER_VERTEX, PIPE_SHADER_VERTEX,
PIPE_SHADER_FRAGMENT,
PIPE_SHADER_GEOMETRY,
PIPE_SHADER_TESS_CTRL, PIPE_SHADER_TESS_CTRL,
PIPE_SHADER_TESS_EVAL, PIPE_SHADER_TESS_EVAL,
PIPE_SHADER_GEOMETRY,
PIPE_SHADER_FRAGMENT,
PIPE_SHADER_COMPUTE, PIPE_SHADER_COMPUTE,
PIPE_SHADER_TYPES, PIPE_SHADER_TYPES,
}; };