1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-27 22:54:16 +01:00

[dxgi] Re-enable SRGB-to-UNORM compatibility

D3D11 is highly inconsistent here and seems to allow UNORM
render target views for SRGB images, but not UAVs.
This commit is contained in:
Philip Rebohle 2018-08-10 19:04:38 +02:00
parent a22d3059a1
commit 50dfab2797
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99

View File

@ -609,7 +609,8 @@ namespace dxvk {
{ VK_FORMAT_R8G8B8A8_UNORM,
VK_FORMAT_R8G8B8A8_SRGB },
// DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
{ },
{ VK_FORMAT_R8G8B8A8_UNORM,
VK_FORMAT_R8G8B8A8_SRGB },
// DXGI_FORMAT_R8G8B8A8_UINT
{ },
// DXGI_FORMAT_R8G8B8A8_SNORM
@ -713,7 +714,8 @@ namespace dxvk {
{ VK_FORMAT_BC1_RGBA_UNORM_BLOCK,
VK_FORMAT_BC1_RGBA_SRGB_BLOCK },
// DXGI_FORMAT_BC1_UNORM_SRGB
{ },
{ VK_FORMAT_BC1_RGBA_UNORM_BLOCK,
VK_FORMAT_BC1_RGBA_SRGB_BLOCK },
// DXGI_FORMAT_BC2_TYPELESS
{ VK_FORMAT_BC2_UNORM_BLOCK,
VK_FORMAT_BC2_SRGB_BLOCK },
@ -721,7 +723,8 @@ namespace dxvk {
{ VK_FORMAT_BC2_UNORM_BLOCK,
VK_FORMAT_BC2_SRGB_BLOCK },
// DXGI_FORMAT_BC2_UNORM_SRGB
{ },
{ VK_FORMAT_BC2_UNORM_BLOCK,
VK_FORMAT_BC2_SRGB_BLOCK },
// DXGI_FORMAT_BC3_TYPELESS
{ VK_FORMAT_BC3_UNORM_BLOCK,
VK_FORMAT_BC3_SRGB_BLOCK },
@ -729,7 +732,8 @@ namespace dxvk {
{ VK_FORMAT_BC3_UNORM_BLOCK,
VK_FORMAT_BC3_SRGB_BLOCK },
// DXGI_FORMAT_BC3_UNORM_SRGB
{ },
{ VK_FORMAT_BC3_UNORM_BLOCK,
VK_FORMAT_BC3_SRGB_BLOCK },
// DXGI_FORMAT_BC4_TYPELESS
{ VK_FORMAT_BC4_UNORM_BLOCK,
VK_FORMAT_BC4_SNORM_BLOCK },
@ -758,12 +762,14 @@ namespace dxvk {
{ VK_FORMAT_B8G8R8A8_UNORM,
VK_FORMAT_B8G8R8A8_SRGB },
// DXGI_FORMAT_B8G8R8A8_UNORM_SRGB
{ },
{ VK_FORMAT_B8G8R8A8_UNORM,
VK_FORMAT_B8G8R8A8_SRGB },
// DXGI_FORMAT_B8G8R8X8_TYPELESS
{ VK_FORMAT_B8G8R8A8_UNORM,
VK_FORMAT_B8G8R8A8_SRGB },
// DXGI_FORMAT_B8G8R8X8_UNORM_SRGB
{ },
{ VK_FORMAT_B8G8R8A8_UNORM,
VK_FORMAT_B8G8R8A8_SRGB },
// DXGI_FORMAT_BC6H_TYPELESS
{ VK_FORMAT_BC6H_UFLOAT_BLOCK,
VK_FORMAT_BC6H_SFLOAT_BLOCK },
@ -778,7 +784,8 @@ namespace dxvk {
{ VK_FORMAT_BC7_UNORM_BLOCK,
VK_FORMAT_BC7_SRGB_BLOCK },
// DXGI_FORMAT_BC7_UNORM_SRGB
{ },
{ VK_FORMAT_BC7_UNORM_BLOCK,
VK_FORMAT_BC7_SRGB_BLOCK },
// DXGI_FORMAT_AYUV
{ }, // Unsupported
// DXGI_FORMAT_Y410