fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-18 01:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

zink: fix conditions for draw-parameters

Browse source 
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18275>
This commit is contained in:
Erik Faye-Lund 2022-08-26 14:41:19 +02:00 • committed by Marge Bot
parent ee62a4c751
commit 65c0abe2c8
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -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;

4
src/gallium/drivers/zink/zink_screen.c
View file

@ -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;