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

Handle depth formats better in DDS loading

Browse Source
This commit is contained in:
baldurk
2019-11-19 09:28:10 +00:00
parent 111ca43800
commit 07dc55c39d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/common/dds_readwrite.cpp
+10 -2
View File
@@ -310,8 +310,14 @@ ResourceFormat DXGIFormat2ResourceFormat(DXGI_FORMAT format)
special.SetBGRAOrder(true);
special.type = ResourceFormatType::R4G4B4A4;
return special;
case DXGI_FORMAT_D24_UNORM_S8_UINT: special.type = ResourceFormatType::D24S8; return special;
case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: special.type = ResourceFormatType::D32S8; return special;
case DXGI_FORMAT_D24_UNORM_S8_UINT:
special.compType = CompType::Depth;
special.type = ResourceFormatType::D24S8;
return special;
case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
special.compType = CompType::Depth;
special.type = ResourceFormatType::D32S8;
return special;
case DXGI_FORMAT_YUY2:
special.type = ResourceFormatType::YUV8;
special.compByteWidth = 1;
@@ -391,6 +397,7 @@ ResourceFormat DXGIFormat2ResourceFormat(DXGI_FORMAT format)
return fmt16;
case DXGI_FORMAT_R16G16_FLOAT: fmt16.compCount = 2; return fmt16;
case DXGI_FORMAT_D16_UNORM: fmt16.compType = CompType::Depth; return fmt16;
case DXGI_FORMAT_R16_UINT: fmt16.compType = CompType::UInt; return fmt16;
case DXGI_FORMAT_R16_SINT: fmt16.compType = CompType::SInt; return fmt16;
case DXGI_FORMAT_R16_UNORM: fmt16.compType = CompType::UNorm; return fmt16;
@@ -615,6 +622,7 @@ DXGI_FORMAT ResourceFormat2DXGIFormat(ResourceFormat format)
{
switch(format.compType)
{
case CompType::Depth: return DXGI_FORMAT_D16_UNORM;
case CompType::UInt: return DXGI_FORMAT_R16_UINT;
case CompType::SInt: return DXGI_FORMAT_R16_SINT;
case CompType::UNorm: return DXGI_FORMAT_R16_UNORM;