fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 22:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: fix portability_subset usage after rename from EXTX to KHR

Browse source 
Signed-off-by: Eric Engestrom <eric@igalia.com>
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17466>
This commit is contained in:
Eric Engestrom 2022-07-11 18:40:04 +01:00 • committed by Marge Bot
parent 643623e1a3
commit 282013fe86
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/zink/zink_device_info.py
View file

@ -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),

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

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