lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-10-04 19:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Back out 01bffe6a0 so that typeless formats are visible.

Browse Source 
* It doesn't seem to be needed anymore
This commit is contained in:
baldurk
2016-06-24 11:49:07 +02:00
parent 9dbcaaf96b
commit d72e7401b0
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_common.cpp
+4 -17
View File
@@ -508,11 +508,7 @@ ResourceFormat MakeResourceFormat(DXGI_FORMAT fmt)
default: ret.special = true;
}
// fetch component type from typedFormat so that we don't set eCompType_None.
// This is a bit of a hack but it's more consistent overall.
DXGI_FORMAT typedFormat = GetTypedFormat(fmt);
switch(typedFormat)
switch(fmt)
{
case DXGI_FORMAT_R32G32B32A32_TYPELESS:
case DXGI_FORMAT_R32G32B32_TYPELESS:
@@ -523,10 +519,7 @@ ResourceFormat MakeResourceFormat(DXGI_FORMAT fmt)
case DXGI_FORMAT_R16_TYPELESS:
case DXGI_FORMAT_R8G8B8A8_TYPELESS:
case DXGI_FORMAT_R8G8_TYPELESS:
case DXGI_FORMAT_R8_TYPELESS:
RDCERR("We should have converted format to typed! %d", typedFormat);
ret.compType = eCompType_None;
break;
case DXGI_FORMAT_R8_TYPELESS: ret.compType = eCompType_None; break;
case DXGI_FORMAT_R32G32B32A32_FLOAT:
case DXGI_FORMAT_R32G32B32_FLOAT:
case DXGI_FORMAT_R16G16B16A16_FLOAT:
@@ -580,10 +573,7 @@ ResourceFormat MakeResourceFormat(DXGI_FORMAT fmt)
case DXGI_FORMAT_BC6H_SF16:
case DXGI_FORMAT_BC6H_TYPELESS: ret.compType = eCompType_SNorm; break;
case DXGI_FORMAT_R24G8_TYPELESS:
RDCERR("We should have converted format to typed! %d", typedFormat);
ret.compType = eCompType_None;
break;
case DXGI_FORMAT_R24G8_TYPELESS: ret.compType = eCompType_None; break;
case DXGI_FORMAT_X24_TYPELESS_G8_UINT:
case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
@@ -601,10 +591,7 @@ ResourceFormat MakeResourceFormat(DXGI_FORMAT fmt)
case DXGI_FORMAT_BC3_TYPELESS:
case DXGI_FORMAT_BC4_TYPELESS:
case DXGI_FORMAT_BC5_TYPELESS:
case DXGI_FORMAT_BC7_TYPELESS:
RDCERR("We should have converted format to typed! %d", typedFormat);
ret.compType = eCompType_None;
break;
case DXGI_FORMAT_BC7_TYPELESS: ret.compType = eCompType_None; break;
case DXGI_FORMAT_R8G8_B8G8_UNORM:
case DXGI_FORMAT_G8R8_G8B8_UNORM:
case DXGI_FORMAT_R10G10B10A2_UNORM: