jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2921 from jpark37/vulkan-format-fail

Browse Source 
win-capture: Fail on unsupported Vulkan formats
This commit is contained in:
Jim 2020-05-21 17:29:57 -07:00 committed by GitHub
commit ad919b47ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/win-capture/graphics-hook/vulkan-capture.c
View File

@ -471,16 +471,24 @@ static inline bool vk_shtex_init_d3d11_tex(struct vk_data *data,
IDXGIResource *dxgi_res;
HRESULT hr;
const UINT width = swap->image_extent.width;
const UINT height = swap->image_extent.height;
flog("OBS requesting %s texture format. capture dimensions: %ux%u",
vk_format_to_str(swap->format), width, height);
const DXGI_FORMAT format = vk_format_to_dxgi(swap->format);
if (format == DXGI_FORMAT_UNKNOWN) {
flog("cannot convert to DXGI format");
return false;
}
D3D11_TEXTURE2D_DESC desc = {0};
desc.Width = swap->image_extent.width;
desc.Height = swap->image_extent.height;
desc.Width = width;
desc.Height = height;
desc.MipLevels = 1;
desc.ArraySize = 1;
flog("OBS requesting %s texture format. capture dimensions: %dx%d",
vk_format_to_str(swap->format), (int)desc.Width, (int)desc.Height);
desc.Format = vk_format_to_dxgi(swap->format);
desc.Format = format;
desc.SampleDesc.Count = 1;
desc.SampleDesc.Quality = 0;
desc.Usage = D3D11_USAGE_DEFAULT;

6
plugins/win-capture/graphics-hook/vulkan-capture.h
View File

@ -474,7 +474,6 @@ DXGI_FORMAT vk_format_to_dxgi(VkFormat format)
case VK_FORMAT_A8B8G8R8_SRGB_PACK32:
break;
case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
dxgi_format = DXGI_FORMAT_R10G10B10A2_UNORM;
break;
case VK_FORMAT_A2R10G10B10_SNORM_PACK32:
break;
@ -842,11 +841,6 @@ DXGI_FORMAT vk_format_to_dxgi(VkFormat format)
case VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG:
break;
}
if (dxgi_format == DXGI_FORMAT_UNKNOWN) {
flog("unknown swapchain format, "
"defaulting to B8G8R8A8_UNORM");
dxgi_format = DXGI_FORMAT_B8G8R8A8_UNORM;
}
return dxgi_format;
}