Merge branch 'master' into d3d12_r24g8

Author: TheMostDiligent

Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp

@@ -246,6 +246,12 @@ DXGI_FORMAT CorrectDXGIFormat(DXGI_FORMAT DXGIFormat, Uint32 BindFlags)
                 DXGIFormat = DXGI_FORMAT_D16_UNORM;
                 break;
 
+            case DXGI_FORMAT_R32G8X24_TYPELESS:
+            case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
+            case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT:
+                DXGIFormat = DXGI_FORMAT_D32_FLOAT_S8X24_UINT;
+                break;
+
             default:
                 break;
         }
@@ -270,6 +276,11 @@ DXGI_FORMAT CorrectDXGIFormat(DXGI_FORMAT DXGIFormat, Uint32 BindFlags)
                 DXGIFormat = DXGI_FORMAT_R16_UNORM;
                 break;
 
+            case DXGI_FORMAT_R32G8X24_TYPELESS:
+            case DXGI_FORMAT_D32_FLOAT_S8X24_UINT:
+                DXGIFormat = DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS;
+                break;
+
             default:
                 break;
         }

Graphics/GraphicsTools/src/XXH128Hasher.cpp

@@ -64,7 +64,7 @@ void XXH128State::Update(const ShaderCreateInfo& ShaderCI) noexcept
 {
     ASSERT_SIZEOF64(ShaderCI, 152, "Did you add new members to ShaderCreateInfo? Please handle them here.");
 
-    Update(ShaderCI.SourceLength, // Aka ByteCodeSize
+    Update(static_cast<Uint32>(ShaderCI.SourceLength), // Aka ByteCodeSize
            ShaderCI.EntryPoint,
            ShaderCI.Desc,
            ShaderCI.SourceLanguage,

Tests/DiligentCoreAPITest/src/TextureCreationTest.cpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -771,10 +771,10 @@ const TextureTestAttribs TestList[] =
     {TEX_FORMAT_RG32_UINT,         8, BindSRU, true},
     {TEX_FORMAT_RG32_SINT,         8, BindSRU, true},
 
-    {TEX_FORMAT_R32G8X24_TYPELESS,        8, BindD, false},
-    {TEX_FORMAT_D32_FLOAT_S8X24_UINT,     8, BindD, false},
-  //{TEX_FORMAT_R32_FLOAT_X8X24_TYPELESS, 8, BindD, false},
-  //{TEX_FORMAT_X32_TYPELESS_G8X24_UINT,  8, BindD, false},
+    {TEX_FORMAT_R32G8X24_TYPELESS,        8, BindSD, false},
+    {TEX_FORMAT_D32_FLOAT_S8X24_UINT,     8, BindD,  false},
+  //{TEX_FORMAT_R32_FLOAT_X8X24_TYPELESS, 8, BindD,  false},
+  //{TEX_FORMAT_X32_TYPELESS_G8X24_UINT,  8, BindD,  false},
 
     {TEX_FORMAT_RGB10A2_TYPELESS,        4, BindSR,  true},
     {TEX_FORMAT_RGB10A2_UNORM,           4, BindSR,  true},