OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: move maintenance2 extension to right file

Browse Source 
Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8862>
This commit is contained in:
Mike Blumenkrantz
2021-02-03 15:29:39 -05:00
committed by Marge Bot
parent a88cd98315
commit 50bac9f3fb
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/zink/zink_device_info.py
View File

@@ -61,6 +61,7 @@ import sys
EXTENSIONS = [ EXTENSIONS = [
Extension("VK_KHR_maintenance1", Extension("VK_KHR_maintenance1",
required=True), required=True),
Extension("VK_KHR_maintenance2"),
Extension("VK_KHR_external_memory"), Extension("VK_KHR_external_memory"),
Extension("VK_KHR_external_memory_fd"), Extension("VK_KHR_external_memory_fd"),
Extension("VK_KHR_vulkan_memory_model"), Extension("VK_KHR_vulkan_memory_model"),

1
src/gallium/drivers/zink/zink_instance.py
View File

@@ -42,7 +42,6 @@ import sys
# will be added by the codegen accordingly. # will be added by the codegen accordingly.
EXTENSIONS = [ EXTENSIONS = [
Extension("VK_EXT_debug_utils"), Extension("VK_EXT_debug_utils"),
Extension("VK_KHR_maintenance2"),
Extension("VK_KHR_get_physical_device_properties2", Extension("VK_KHR_get_physical_device_properties2",
functions=["GetPhysicalDeviceFeatures2", "GetPhysicalDeviceProperties2"]), functions=["GetPhysicalDeviceFeatures2", "GetPhysicalDeviceProperties2"]),
Extension("VK_KHR_draw_indirect_count", Extension("VK_KHR_draw_indirect_count",

2
src/gallium/drivers/zink/zink_screen.c
View File

@@ -423,7 +423,7 @@ zink_get_shader_param(struct pipe_screen *pscreen,
case PIPE_SHADER_TESS_EVAL: case PIPE_SHADER_TESS_EVAL:
if (screen->info.have_KHR_vulkan_memory_model && if (screen->info.have_KHR_vulkan_memory_model &&
screen->info.feats.features.tessellationShader && screen->info.feats.features.tessellationShader &&
screen->instance_info.have_KHR_maintenance2) screen->info.have_KHR_maintenance2)
return INT_MAX; return INT_MAX;
break; break;