Module: Mesa Branch: main Commit: 8a5106f91a36ee14d013e2a98005ff9e4922ea16 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a5106f91a36ee14d013e2a98005ff9e4922ea16
Author: Samuel Pitoiset <[email protected]> Date: Fri Dec 15 16:25:30 2023 +0100 radv: move RADV_HASH_SHADER_xxx flags to radv_pipeline.c Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26713> --- src/amd/vulkan/radv_pipeline.c | 13 +++++++++++++ src/amd/vulkan/radv_private.h | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index efc86f05f90..38048d9cfc8 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -225,6 +225,19 @@ radv_generate_pipeline_key(const struct radv_device *device, const VkPipelineSha return key; } +#define RADV_HASH_SHADER_CS_WAVE32 (1 << 1) +#define RADV_HASH_SHADER_PS_WAVE32 (1 << 2) +#define RADV_HASH_SHADER_GE_WAVE32 (1 << 3) +#define RADV_HASH_SHADER_LLVM (1 << 4) +#define RADV_HASH_SHADER_KEEP_STATISTICS (1 << 8) +#define RADV_HASH_SHADER_USE_NGG_CULLING (1 << 13) +#define RADV_HASH_SHADER_EMULATE_RT (1 << 16) +#define RADV_HASH_SHADER_SPLIT_FMA (1 << 17) +#define RADV_HASH_SHADER_RT_WAVE64 (1 << 18) +#define RADV_HASH_SHADER_NO_FMASK (1 << 19) +#define RADV_HASH_SHADER_NO_RT (1 << 20) +#define RADV_HASH_SHADER_DUAL_BLEND_MRT1 (1 << 21) + uint32_t radv_get_hash_flags(const struct radv_device *device, bool stats) { diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 9aa9ea68fc0..1880e6269cf 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -2067,19 +2067,6 @@ struct radv_event { uint64_t *map; }; -#define RADV_HASH_SHADER_CS_WAVE32 (1 << 1) -#define RADV_HASH_SHADER_PS_WAVE32 (1 << 2) -#define RADV_HASH_SHADER_GE_WAVE32 (1 << 3) -#define RADV_HASH_SHADER_LLVM (1 << 4) -#define RADV_HASH_SHADER_KEEP_STATISTICS (1 << 8) -#define RADV_HASH_SHADER_USE_NGG_CULLING (1 << 13) -#define RADV_HASH_SHADER_EMULATE_RT (1 << 16) -#define RADV_HASH_SHADER_SPLIT_FMA (1 << 17) -#define RADV_HASH_SHADER_RT_WAVE64 (1 << 18) -#define RADV_HASH_SHADER_NO_FMASK (1 << 19) -#define RADV_HASH_SHADER_NO_RT (1 << 20) -#define RADV_HASH_SHADER_DUAL_BLEND_MRT1 (1 << 21) - struct radv_pipeline_key; struct radv_ray_tracing_group;
