lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 21:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly reject BGRA order versions of formats we don't support on D3D

Browse Source
This commit is contained in:
baldurk
2019-11-25 15:50:48 +00:00
parent f35e082228
commit 966d71e096
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/dxgi/dxgi_common.cpp
+24 -1
View File
@@ -1997,6 +1997,9 @@ DXGI_FORMAT MakeDXGIFormat(ResourceFormat fmt)
case ResourceFormatType::BC6: ret = DXGI_FORMAT_BC6H_UF16; break;
case ResourceFormatType::BC7: ret = DXGI_FORMAT_BC7_UNORM; break;
case ResourceFormatType::R10G10B10A2:
// only support rgba order
if(fmt.BGRAOrder())
return DXGI_FORMAT_UNKNOWN;
if(fmt.compType == CompType::UNorm)
ret = DXGI_FORMAT_R10G10B10A2_UNORM;
else if(fmt.compType == CompType::Float)
@@ -2153,8 +2156,16 @@ DXGI_FORMAT MakeDXGIFormat(ResourceFormat fmt)
else
return DXGI_FORMAT_UNKNOWN;
// only support 8-bit UNORM for BGRA order
if(fmt.BGRAOrder())
ret = DXGI_FORMAT_B8G8R8A8_UNORM;
{
if(fmt.compByteWidth == 1 && fmt.compType == CompType::UNorm)
return DXGI_FORMAT_B8G8R8A8_UNORM;
else if(fmt.compByteWidth == 1 && fmt.compType == CompType::UNormSRGB)
return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB;
else
return DXGI_FORMAT_UNKNOWN;
}
}
else if(fmt.compCount == 3)
{
@@ -2162,6 +2173,10 @@ DXGI_FORMAT MakeDXGIFormat(ResourceFormat fmt)
ret = DXGI_FORMAT_R32G32B32_TYPELESS;
else
return DXGI_FORMAT_UNKNOWN;
// only support RGBA order
if(fmt.BGRAOrder())
return DXGI_FORMAT_UNKNOWN;
}
else if(fmt.compCount == 2)
{
@@ -2173,6 +2188,10 @@ DXGI_FORMAT MakeDXGIFormat(ResourceFormat fmt)
ret = DXGI_FORMAT_R8G8_TYPELESS;
else
return DXGI_FORMAT_UNKNOWN;
// only support RGBA order
if(fmt.BGRAOrder())
return DXGI_FORMAT_UNKNOWN;
}
else if(fmt.compCount == 1)
{
@@ -2184,6 +2203,10 @@ DXGI_FORMAT MakeDXGIFormat(ResourceFormat fmt)
ret = DXGI_FORMAT_R8_TYPELESS;
else
return DXGI_FORMAT_UNKNOWN;
// only support RGBA order
if(fmt.BGRAOrder())
return DXGI_FORMAT_UNKNOWN;
}
else
{