From 282013fe86ef3642c6bad086b0ff6ab7ab6e2507 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 11 Jul 2022 18:40:04 +0100 Subject: [PATCH] zink: fix portability_subset usage after rename from EXTX to KHR Signed-off-by: Eric Engestrom Acked-by: Mike Blumenkrantz Acked-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/zink_device_info.py | 5 ++--- src/gallium/drivers/zink/zink_screen.c | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/zink/zink_device_info.py b/src/gallium/drivers/zink/zink_device_info.py index 8002edc4f7c..df7c8f30eed 100644 --- a/src/gallium/drivers/zink/zink_device_info.py +++ b/src/gallium/drivers/zink/zink_device_info.py @@ -190,9 +190,8 @@ EXTENSIONS = [ conditions=["$feats.pipelineCreationCacheControl"]), Extension("VK_EXT_shader_stencil_export", alias="stencil_export"), - Extension("VK_EXTX_portability_subset", - alias="portability_subset_extx", - nonstandard=True, + Extension("VK_KHR_portability_subset", + alias="portability_subset", properties=True, features=True, guard=True), diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index e5a293a80f2..6fa8f50c7bd 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2221,11 +2221,11 @@ zink_internal_create_screen(const struct pipe_screen_config *config) goto fail; screen->have_triangle_fans = true; -#if defined(VK_EXTX_PORTABILITY_SUBSET_EXTENSION_NAME) - if (screen->info.have_EXTX_portability_subset) { - screen->have_triangle_fans = (VK_TRUE == screen->info.portability_subset_extx_feats.triangleFans); +#if defined(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME) + if (screen->info.have_KHR_portability_subset) { + screen->have_triangle_fans = (VK_TRUE == screen->info.portability_subset_feats.triangleFans); } -#endif // VK_EXTX_PORTABILITY_SUBSET_EXTENSION_NAME +#endif // VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME check_base_requirements(screen); util_live_shader_cache_init(&screen->shaders, zink_create_gfx_shader_state, zink_delete_shader_state);