mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 11:06:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts, a/vk: Fix calling functions using their Vulkan 1.0 name rather than promoted name

Browse source 
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2233>
This commit is contained in:
Rylie Pavlik 2024-06-05 11:51:28 -05:00 committed by Marge Bot
parent 764263d171
commit 182d87015f
4 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/changes/compositor/mr.2233.md Normal file
View file

@ -0,0 +1 @@
Fix: General correctness and valid usage issues.

24
scripts/generate_vk_helpers.py
View file

@ -8,6 +8,10 @@ from typing import Callable, Iterable, List, Optional
def get_device_cmds(): def get_device_cmds():
# NOTE: Be sure to use the Vulkan 1.0 name of functions in here!
# (so, the decorated extension version)
# If you want to alias it in the generated file, use the member_name
# keyword argument.
return [ return [
Cmd("vkDestroyDevice"), Cmd("vkDestroyDevice"),
Cmd("vkDeviceWaitIdle"), Cmd("vkDeviceWaitIdle"),
@ -194,8 +198,14 @@ def get_instance_cmds():
None, None,
Cmd("vkEnumeratePhysicalDevices"), Cmd("vkEnumeratePhysicalDevices"),
Cmd("vkGetPhysicalDeviceProperties"), Cmd("vkGetPhysicalDeviceProperties"),
Cmd("vkGetPhysicalDeviceProperties2"), Cmd(
Cmd("vkGetPhysicalDeviceFeatures2"), "vkGetPhysicalDeviceProperties2KHR",
member_name="vkGetPhysicalDeviceProperties2",
),
Cmd(
"vkGetPhysicalDeviceFeatures2KHR",
member_name="vkGetPhysicalDeviceFeatures2",
),
Cmd("vkGetPhysicalDeviceMemoryProperties"), Cmd("vkGetPhysicalDeviceMemoryProperties"),
Cmd("vkGetPhysicalDeviceQueueFamilyProperties"), Cmd("vkGetPhysicalDeviceQueueFamilyProperties"),
Cmd("vkGetPhysicalDeviceSurfaceCapabilitiesKHR"), Cmd("vkGetPhysicalDeviceSurfaceCapabilitiesKHR"),
@ -203,8 +213,14 @@ def get_instance_cmds():
Cmd("vkGetPhysicalDeviceSurfacePresentModesKHR"), Cmd("vkGetPhysicalDeviceSurfacePresentModesKHR"),
Cmd("vkGetPhysicalDeviceSurfaceSupportKHR"), Cmd("vkGetPhysicalDeviceSurfaceSupportKHR"),
Cmd("vkGetPhysicalDeviceFormatProperties"), Cmd("vkGetPhysicalDeviceFormatProperties"),
Cmd("vkGetPhysicalDeviceFormatProperties2KHR", member_name="vkGetPhysicalDeviceFormatProperties2"), Cmd(
Cmd("vkGetPhysicalDeviceImageFormatProperties2"), "vkGetPhysicalDeviceFormatProperties2KHR",
member_name="vkGetPhysicalDeviceFormatProperties2",
),
Cmd(
"vkGetPhysicalDeviceImageFormatProperties2KHR",
member_name="vkGetPhysicalDeviceImageFormatProperties2",
),
Cmd("vkGetPhysicalDeviceExternalBufferPropertiesKHR"), Cmd("vkGetPhysicalDeviceExternalBufferPropertiesKHR"),
Cmd("vkGetPhysicalDeviceExternalFencePropertiesKHR"), Cmd("vkGetPhysicalDeviceExternalFencePropertiesKHR"),
Cmd("vkGetPhysicalDeviceExternalSemaphorePropertiesKHR"), Cmd("vkGetPhysicalDeviceExternalSemaphorePropertiesKHR"),

6
src/xrt/auxiliary/vk/vk_function_loaders.c
View file

@ -68,8 +68,8 @@ vk_get_instance_functions(struct vk_bundle *vk)
vk->vkEnumeratePhysicalDevices = GET_INS_PROC(vk, vkEnumeratePhysicalDevices); vk->vkEnumeratePhysicalDevices = GET_INS_PROC(vk, vkEnumeratePhysicalDevices);
vk->vkGetPhysicalDeviceProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties); vk->vkGetPhysicalDeviceProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties);
vk->vkGetPhysicalDeviceProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties2); vk->vkGetPhysicalDeviceProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceProperties2KHR);
vk->vkGetPhysicalDeviceFeatures2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFeatures2); vk->vkGetPhysicalDeviceFeatures2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFeatures2KHR);
vk->vkGetPhysicalDeviceMemoryProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceMemoryProperties); vk->vkGetPhysicalDeviceMemoryProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceMemoryProperties);
vk->vkGetPhysicalDeviceQueueFamilyProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceQueueFamilyProperties); vk->vkGetPhysicalDeviceQueueFamilyProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceQueueFamilyProperties);
vk->vkGetPhysicalDeviceSurfaceCapabilitiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceCapabilitiesKHR); vk->vkGetPhysicalDeviceSurfaceCapabilitiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceCapabilitiesKHR);
@ -78,7 +78,7 @@ vk_get_instance_functions(struct vk_bundle *vk)
vk->vkGetPhysicalDeviceSurfaceSupportKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceSupportKHR); vk->vkGetPhysicalDeviceSurfaceSupportKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceSurfaceSupportKHR);
vk->vkGetPhysicalDeviceFormatProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceFormatProperties); vk->vkGetPhysicalDeviceFormatProperties = GET_INS_PROC(vk, vkGetPhysicalDeviceFormatProperties);
vk->vkGetPhysicalDeviceFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFormatProperties2KHR); vk->vkGetPhysicalDeviceFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceFormatProperties2KHR);
vk->vkGetPhysicalDeviceImageFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceImageFormatProperties2); vk->vkGetPhysicalDeviceImageFormatProperties2 = GET_INS_PROC(vk, vkGetPhysicalDeviceImageFormatProperties2KHR);
vk->vkGetPhysicalDeviceExternalBufferPropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalBufferPropertiesKHR); vk->vkGetPhysicalDeviceExternalBufferPropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalBufferPropertiesKHR);
vk->vkGetPhysicalDeviceExternalFencePropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalFencePropertiesKHR); vk->vkGetPhysicalDeviceExternalFencePropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalFencePropertiesKHR);
vk->vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalSemaphorePropertiesKHR); vk->vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = GET_INS_PROC(vk, vkGetPhysicalDeviceExternalSemaphorePropertiesKHR);

6
src/xrt/auxiliary/vk/vk_helpers.h
View file

@ -193,8 +193,8 @@ struct vk_bundle
PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices; PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices;
PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties; PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2; PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2;
PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2; PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2;
PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties;
PFN_vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceQueueFamilyProperties; PFN_vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceQueueFamilyProperties;
PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR; PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
@ -203,7 +203,7 @@ struct vk_bundle
PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR; PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR;
PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties; PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties;
PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2; PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2;
PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2; PFN_vkGetPhysicalDeviceImageFormatProperties2KHR vkGetPhysicalDeviceImageFormatProperties2;
PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR; PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR;
PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR; PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR;
PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR; PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;