Module: Mesa Branch: main Commit: 65c0abe2c838bdb2d5c1f2171a2b75fa3ed6117e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65c0abe2c838bdb2d5c1f2171a2b75fa3ed6117e
Author: Erik Faye-Lund <[email protected]> Date: Fri Aug 26 14:41:19 2022 +0200 zink: fix conditions for draw-parameters Acked-By: Mike Blumenkrantz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18275> --- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 3 ++- src/gallium/drivers/zink/zink_screen.c | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c index 93ec73760a9..897bdd9e856 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c +++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c @@ -4158,7 +4158,8 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_ BITSET_TEST(s->info.system_values_read, SYSTEM_VALUE_DRAW_ID) || BITSET_TEST(s->info.system_values_read, SYSTEM_VALUE_BASE_INSTANCE) || BITSET_TEST(s->info.system_values_read, SYSTEM_VALUE_BASE_VERTEX)) { - spirv_builder_emit_extension(&ctx.builder, "SPV_KHR_shader_draw_parameters"); + if (spirv_version < SPIRV_VERSION(1, 3)) + spirv_builder_emit_extension(&ctx.builder, "SPV_KHR_shader_draw_parameters"); spirv_builder_emit_cap(&ctx.builder, SpvCapabilityDrawParameters); } break; diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index b471460f833..1382a36a276 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -447,9 +447,6 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_SURFACE_SAMPLE_COUNT: return screen->vk_version >= VK_MAKE_VERSION(1,2,0); - case PIPE_CAP_DRAW_PARAMETERS: - return screen->info.feats11.shaderDrawParameters || screen->info.have_KHR_shader_draw_parameters; - case PIPE_CAP_SHADER_GROUP_VOTE: if (screen->info.have_vulkan11 && (screen->info.subgroup.supportedOperations & VK_SUBGROUP_FEATURE_VOTE_BIT) && @@ -483,6 +480,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return screen->info.have_KHR_draw_indirect_count; case PIPE_CAP_START_INSTANCE: + case PIPE_CAP_DRAW_PARAMETERS: return (screen->info.have_vulkan12 && screen->info.feats11.shaderDrawParameters) || screen->info.have_KHR_shader_draw_parameters;
