Skip to content

Commit 992fe43

Browse files
CorrectDXGIFormat: fixed handling of D32S8 format
1 parent 5530bc1 commit 992fe43

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,12 @@ DXGI_FORMAT CorrectDXGIFormat(DXGI_FORMAT DXGIFormat, Uint32 BindFlags)
246246
DXGIFormat = DXGI_FORMAT_D16_UNORM;
247247
break;
248248

249+
case DXGI_FORMAT_R32G8X24_TYPELESS:
250+
case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
251+
case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
252+
DXGIFormat = DXGI_FORMAT_D32_FLOAT_S8X24_UINT;
253+
break;
254+
249255
default:
250256
break;
251257
}
@@ -270,6 +276,11 @@ DXGI_FORMAT CorrectDXGIFormat(DXGI_FORMAT DXGIFormat, Uint32 BindFlags)
270276
DXGIFormat = DXGI_FORMAT_R16_UNORM;
271277
break;
272278

279+
case DXGI_FORMAT_R32G8X24_TYPELESS:
280+
case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
281+
DXGIFormat = DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS;
282+
break;
283+
273284
default:
274285
break;
275286
}

Tests/DiligentCoreAPITest/src/TextureCreationTest.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2024 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -771,10 +771,10 @@ const TextureTestAttribs TestList[] =
771771
{TEX_FORMAT_RG32_UINT, 8, BindSRU, true},
772772
{TEX_FORMAT_RG32_SINT, 8, BindSRU, true},
773773

774-
{TEX_FORMAT_R32G8X24_TYPELESS, 8, BindD, false},
775-
{TEX_FORMAT_D32_FLOAT_S8X24_UINT, 8, BindD, false},
776-
//{TEX_FORMAT_R32_FLOAT_X8X24_TYPELESS, 8, BindD, false},
777-
//{TEX_FORMAT_X32_TYPELESS_G8X24_UINT, 8, BindD, false},
774+
{TEX_FORMAT_R32G8X24_TYPELESS, 8, BindSD, false},
775+
{TEX_FORMAT_D32_FLOAT_S8X24_UINT, 8, BindD, false},
776+
//{TEX_FORMAT_R32_FLOAT_X8X24_TYPELESS, 8, BindD, false},
777+
//{TEX_FORMAT_X32_TYPELESS_G8X24_UINT, 8, BindD, false},
778778

779779
{TEX_FORMAT_RGB10A2_TYPELESS, 4, BindSR, true},
780780
{TEX_FORMAT_RGB10A2_UNORM, 4, BindSR, true},

0 commit comments

Comments
 (0)