fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 20:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vk/wsi: update symbols that have become aliases for newer ones

Browse source 
All of these have been renamed in the spec (usually by being promoted);
renamed them in our code too.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26487>
This commit is contained in:
Eric Engestrom 2023-12-03 19:41:49 +00:00 • committed by Marge Bot
parent 84c27ea42c
commit d6144ba88f
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vulkan/wsi/wsi_common.c
View file

@ -171,7 +171,7 @@ wsi_device_init(struct wsi_device *wsi,
if (!wsi->sw)
WSI_GET_CB(GetMemoryFdKHR);
WSI_GET_CB(GetPhysicalDeviceFormatProperties);
WSI_GET_CB(GetPhysicalDeviceFormatProperties2KHR);
WSI_GET_CB(GetPhysicalDeviceFormatProperties2);
WSI_GET_CB(GetPhysicalDeviceImageFormatProperties2);
WSI_GET_CB(GetSemaphoreFdKHR);
WSI_GET_CB(ResetFences);
@ -180,7 +180,7 @@ wsi_device_init(struct wsi_device *wsi,
WSI_GET_CB(MapMemory);
WSI_GET_CB(UnmapMemory);
if (wsi->khr_present_wait)
WSI_GET_CB(WaitSemaphoresKHR);
WSI_GET_CB(WaitSemaphores);
#undef WSI_GET_CB
#ifdef VK_USE_PLATFORM_XCB_KHR
@ -1612,7 +1612,7 @@ wsi_swapchain_wait_for_present_semaphore(const struct wsi_swapchain *chain,
.pValues = &present_id,
};
return chain->wsi->WaitSemaphoresKHR(chain->device, &wait_info, timeout);
return chain->wsi->WaitSemaphores(chain->device, &wait_info, timeout);
}
uint32_t

4
src/vulkan/wsi/wsi_common.h
View file

@ -253,7 +253,7 @@ struct wsi_device {
WSI_CB(GetImageSubresourceLayout);
WSI_CB(GetMemoryFdKHR);
WSI_CB(GetPhysicalDeviceFormatProperties);
WSI_CB(GetPhysicalDeviceFormatProperties2KHR);
WSI_CB(GetPhysicalDeviceFormatProperties2);
WSI_CB(GetPhysicalDeviceImageFormatProperties2);
WSI_CB(GetSemaphoreFdKHR);
WSI_CB(ResetFences);
@ -261,7 +261,7 @@ struct wsi_device {
WSI_CB(WaitForFences);
WSI_CB(MapMemory);
WSI_CB(UnmapMemory);
WSI_CB(WaitSemaphoresKHR);
WSI_CB(WaitSemaphores);
#undef WSI_CB
struct wsi_interface * wsi[VK_ICD_WSI_PLATFORM_MAX];

12
src/vulkan/wsi/wsi_common_drm.c
View file

@ -336,9 +336,9 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
.sType = VK_STRUCTURE_TYPE_FORMAT_PROPERTIES_2,
.pNext = &modifier_props_list,
};
wsi->GetPhysicalDeviceFormatProperties2KHR(wsi->pdevice,
pCreateInfo->imageFormat,
&format_props);
wsi->GetPhysicalDeviceFormatProperties2(wsi->pdevice,
pCreateInfo->imageFormat,
&format_props);
assert(modifier_props_list.drmFormatModifierCount > 0);
info->modifier_props =
vk_alloc(&chain->alloc,
@ -349,9 +349,9 @@ wsi_configure_native_image(const struct wsi_swapchain *chain,
goto fail_oom;
modifier_props_list.pDrmFormatModifierProperties = info->modifier_props;
wsi->GetPhysicalDeviceFormatProperties2KHR(wsi->pdevice,
pCreateInfo->imageFormat,
&format_props);
wsi->GetPhysicalDeviceFormatProperties2(wsi->pdevice,
pCreateInfo->imageFormat,
&format_props);
/* Call GetImageFormatProperties with every modifier and filter the list
* down to those that we know work.

16
src/vulkan/wsi/wsi_common_headless.c
View file

@ -150,20 +150,20 @@ wsi_headless_surface_get_formats(VkIcdSurfaceBase *icd_surface,
if (wsi->wsi->force_bgra8_unorm_first) {
vk_outarray_append_typed(VkSurfaceFormatKHR, &out, out_fmt) {
out_fmt->format = VK_FORMAT_B8G8R8A8_UNORM;
out_fmt->colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
out_fmt->colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
}
vk_outarray_append_typed(VkSurfaceFormatKHR, &out, out_fmt) {
out_fmt->format = VK_FORMAT_R8G8B8A8_UNORM;
out_fmt->colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
out_fmt->colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
}
} else {
vk_outarray_append_typed(VkSurfaceFormatKHR, &out, out_fmt) {
out_fmt->format = VK_FORMAT_R8G8B8A8_UNORM;
out_fmt->colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
out_fmt->colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
}
vk_outarray_append_typed(VkSurfaceFormatKHR, &out, out_fmt) {
out_fmt->format = VK_FORMAT_B8G8R8A8_UNORM;
out_fmt->colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
out_fmt->colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
}
}
@ -185,20 +185,20 @@ wsi_headless_surface_get_formats2(VkIcdSurfaceBase *icd_surface,
if (wsi->wsi->force_bgra8_unorm_first) {
vk_outarray_append_typed(VkSurfaceFormat2KHR, &out, out_fmt) {
out_fmt->surfaceFormat.format = VK_FORMAT_B8G8R8A8_UNORM;
out_fmt->surfaceFormat.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
out_fmt->surfaceFormat.colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
}
vk_outarray_append_typed(VkSurfaceFormat2KHR, &out, out_fmt) {
out_fmt->surfaceFormat.format = VK_FORMAT_R8G8B8A8_UNORM;
out_fmt->surfaceFormat.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
out_fmt->surfaceFormat.colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
}
} else {
vk_outarray_append_typed(VkSurfaceFormat2KHR, &out, out_fmt) {
out_fmt->surfaceFormat.format = VK_FORMAT_R8G8B8A8_UNORM;
out_fmt->surfaceFormat.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
out_fmt->surfaceFormat.colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
}
vk_outarray_append_typed(VkSurfaceFormat2KHR, &out, out_fmt) {
out_fmt->surfaceFormat.format = VK_FORMAT_B8G8R8A8_UNORM;
out_fmt->surfaceFormat.colorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
out_fmt->surfaceFormat.colorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
}
}