diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2018-04-03 12:25:51 -0400 |
|---|---|---|
| committer | Tim Foley <tfoleyNV@users.noreply.github.com> | 2018-04-03 09:25:51 -0700 |
| commit | 3115ba7a3640937df01ecf60f7ff55f71a3ab7c2 (patch) | |
| tree | e92edd95391270df3afdd1c0bc36aebf16e5994e /tools/render-test/d3d-util.cpp | |
| parent | 499e2586cba2a7ba2a703b90c459b24620e351ee (diff) | |
Fixes based on review of feature/dx12 PR. (#473)
Diffstat (limited to 'tools/render-test/d3d-util.cpp')
| -rw-r--r-- | tools/render-test/d3d-util.cpp | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/tools/render-test/d3d-util.cpp b/tools/render-test/d3d-util.cpp index ff07fc2ea..09e0891f9 100644 --- a/tools/render-test/d3d-util.cpp +++ b/tools/render-test/d3d-util.cpp @@ -42,8 +42,11 @@ using namespace Slang; { switch (format) { - case DXGI_FORMAT_R32_FLOAT: - case DXGI_FORMAT_D32_FLOAT: return DXGI_FORMAT_R32_TYPELESS; + case DXGI_FORMAT_R32_FLOAT: /* fallthru */ + case DXGI_FORMAT_D32_FLOAT: + { + return DXGI_FORMAT_R32_TYPELESS; + } case DXGI_FORMAT_D24_UNORM_S8_UINT: return DXGI_FORMAT_R24G8_TYPELESS; default: break; } @@ -65,8 +68,11 @@ using namespace Slang; { switch (format) { - case DXGI_FORMAT_D32_FLOAT: - case DXGI_FORMAT_R32_TYPELESS: return DXGI_FORMAT_D32_FLOAT; + case DXGI_FORMAT_D32_FLOAT: /* fallthru */ + case DXGI_FORMAT_R32_TYPELESS: + { + return DXGI_FORMAT_D32_FLOAT; + } case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: return DXGI_FORMAT_D24_UNORM_S8_UINT; case DXGI_FORMAT_R24G8_TYPELESS: return DXGI_FORMAT_D24_UNORM_S8_UINT; default: break; @@ -77,8 +83,11 @@ using namespace Slang; { switch (format) { - case DXGI_FORMAT_D32_FLOAT: - case DXGI_FORMAT_D24_UNORM_S8_UINT: return DXGI_FORMAT_UNKNOWN; + case DXGI_FORMAT_D32_FLOAT: /* fallthru */ + case DXGI_FORMAT_D24_UNORM_S8_UINT: + { + return DXGI_FORMAT_UNKNOWN; + } case DXGI_FORMAT_R32_TYPELESS: return DXGI_FORMAT_R32_FLOAT; default: break; } @@ -88,8 +97,11 @@ using namespace Slang; { switch (format) { - case DXGI_FORMAT_D32_FLOAT: - case DXGI_FORMAT_R32_TYPELESS: return DXGI_FORMAT_R32_FLOAT; + case DXGI_FORMAT_D32_FLOAT: /* fallthru */ + case DXGI_FORMAT_R32_TYPELESS: + { + return DXGI_FORMAT_R32_FLOAT; + } case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: return DXGI_FORMAT_R24_UNORM_X8_TYPELESS; default: break; } @@ -149,22 +161,25 @@ bool D3DUtil::isTypeless(DXGI_FORMAT format) case DXGI_FORMAT_R32G32B32_FLOAT: case DXGI_FORMAT_R32G32B32_UINT: case DXGI_FORMAT_R32G32B32_SINT: + { return 32; - + } case DXGI_FORMAT_R16G16B16A16_TYPELESS: case DXGI_FORMAT_R16G16B16A16_FLOAT: case DXGI_FORMAT_R16G16B16A16_UNORM: case DXGI_FORMAT_R16G16B16A16_UINT: case DXGI_FORMAT_R16G16B16A16_SNORM: case DXGI_FORMAT_R16G16B16A16_SINT: + { return 16; - + } case DXGI_FORMAT_R10G10B10A2_TYPELESS: case DXGI_FORMAT_R10G10B10A2_UNORM: case DXGI_FORMAT_R10G10B10A2_UINT: case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: + { return 10; - + } case DXGI_FORMAT_R8G8B8A8_TYPELESS: case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: @@ -177,12 +192,14 @@ bool D3DUtil::isTypeless(DXGI_FORMAT format) case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: case DXGI_FORMAT_B8G8R8X8_TYPELESS: case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: + { return 8; - + } case DXGI_FORMAT_B5G6R5_UNORM: case DXGI_FORMAT_B5G5R5A1_UNORM: + { return 5; - + } case DXGI_FORMAT_B4G4R4A4_UNORM: return 4; |