From f851c180dfd4feceda48b7d2e2b63a1124eeb1a0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 18 Jun 2022 09:43:01 -0400 Subject: [PATCH] zink: add a #define for vk shader bits Acked-by: Dave Airlie Reviewed-By: Tatsuyuki Ishi Part-of: --- src/gallium/drivers/zink/zink_context.c | 6 +----- src/gallium/drivers/zink/zink_context.h | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index db7441de53e..5e94582cdd9 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -3063,11 +3063,7 @@ zink_resource_image_barrier_init(VkImageMemoryBarrier *imb, struct zink_resource static inline bool is_shader_pipline_stage(VkPipelineStageFlags pipeline) { - return pipeline & (VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | - VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT | - VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT | - VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT | - VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT); + return pipeline & GFX_SHADER_BITS; } static void diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h index 529281d1308..c0cb4324a16 100644 --- a/src/gallium/drivers/zink/zink_context.h +++ b/src/gallium/drivers/zink/zink_context.h @@ -50,6 +50,12 @@ #include +#define GFX_SHADER_BITS (VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | \ + VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT | \ + VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT | \ + VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT | \ + VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT) + #define pipe_buffer_write "use tc_buffer_write to avoid breaking threaded context" #ifdef __cplusplus