Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-28 06:28:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Return proper number of recognized swapchain formats if some are not recognized.

Browse Source 
Link: https://github.com/ValveSoftware/Proton/pull/6079

Edited by Paul Gofman:
- fixed behaviour for Vulkan instance type;
- stylistic changes.
This commit is contained in:
Shawn Wallace 2022-08-08 19:22:49 -04:00 committed by Arkadiusz Hiler
parent 66e57462c1
commit 618221db82
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
wineopenxr/openxr.c
View File

@ -1909,26 +1909,46 @@ int64_t map_format_vulkan_to_dxgi(int64_t format)
XrResult WINAPI wine_xrEnumerateSwapchainFormats(XrSession session, uint32_t formatCapacityInput, uint32_t *formatCountOutput, int64_t *formats) XrResult WINAPI wine_xrEnumerateSwapchainFormats(XrSession session, uint32_t formatCapacityInput, uint32_t *formatCountOutput, int64_t *formats)
{ {
wine_XrSession *wine_session = (wine_XrSession *)session; wine_XrSession *wine_session = (wine_XrSession *)session;
XrResult res; uint32_t real_format_count;
int64_t *real_formats;
uint32_t i, o; uint32_t i, o;
XrResult res;
WINE_TRACE("%p, %u, %p, %p\n", session, formatCapacityInput, formatCountOutput, formats); WINE_TRACE("%p, %u, %p, %p\n", session, formatCapacityInput, formatCountOutput, formats);
res = xrEnumerateSwapchainFormats(wine_session->session, formatCapacityInput, formatCountOutput, formats); if (wine_session->wine_instance->instance_type != INSTANCE_TYPE_D3D11)
return xrEnumerateSwapchainFormats(wine_session->session, formatCapacityInput, formatCountOutput, formats);
if(wine_session->wine_instance->instance_type == INSTANCE_TYPE_D3D11){ res = xrEnumerateSwapchainFormats(wine_session->session, 0, &real_format_count, NULL);
if(res == XR_SUCCESS && formatCapacityInput && formats){ if (res != XR_SUCCESS) return res;
o = 0;
for(i = 0; i < *formatCountOutput; ++i){ real_formats = heap_alloc(sizeof(*real_formats) * real_format_count);
int64_t mapped = map_format_vulkan_to_dxgi(formats[i]); res = xrEnumerateSwapchainFormats(wine_session->session, real_format_count, formatCountOutput, real_formats);
if(mapped != DXGI_FORMAT_UNKNOWN){
formats[o++] = mapped; if (res != XR_SUCCESS)
} goto done;
}
*formatCountOutput = o; o = 0;
for(i = 0; i < real_format_count; ++i)
{
int64_t mapped = map_format_vulkan_to_dxgi(real_formats[i]);
if (mapped == DXGI_FORMAT_UNKNOWN)
continue;
if (formatCapacityInput && formats)
{
if (o < formatCapacityInput)
formats[o] = mapped;
else
res = XR_ERROR_SIZE_INSUFFICIENT;
} }
++o;
} }
*formatCountOutput = o;
done:
heap_free(real_formats);
return res; return res;
} }