Layers/xrRenderDX10/dx10HW.cpp: HW refactor

Implementation for format support check
Moved device creation code to be earlier
In future we can support more formats.

Author: Xottab-DUTY

src/Layers/xrRender/HW.h

@@ -126,6 +126,8 @@ class CHW
     void UpdateViews();
 #endif
 #if defined(USE_DX10) || defined(USE_DX11)
+    bool CheckFormatSupport(DXGI_FORMAT format, D3D_FORMAT_SUPPORT feature) const;
+    DXGI_FORMAT SelectFormat(D3D_FORMAT_SUPPORT feature, const DXGI_FORMAT formats[], size_t count) const;
     virtual void OnAppActivate();
     virtual void OnAppDeactivate();
 #endif //	USE_DX10

src/Layers/xrRenderDX10/DXCommonTypes.h

@@ -88,6 +88,8 @@ typedef ID3D11DeviceContext ID3DDeviceContext;
 #define D3D_CULL_FRONT D3D11_CULL_FRONT
 #define D3D_CULL_BACK D3D11_CULL_BACK
 
+#define D3D_CREATE_DEVICE_DEBUG D3D11_CREATE_DEVICE_DEBUG
+
 #define D3D_COMPARISON_NEVER D3D11_COMPARISON_NEVER
 #define D3D_COMPARISON_LESS D3D11_COMPARISON_LESS
 #define D3D_COMPARISON_EQUAL D3D11_COMPARISON_EQUAL
@@ -147,6 +149,10 @@ typedef ID3D11DeviceContext ID3DDeviceContext;
 #define D3D_FILL_SOLID D3D11_FILL_SOLID
 #define D3D_FILL_WIREFRAME D3D11_FILL_WIREFRAME
 
+#define D3D_FORMAT_SUPPORT D3D11_FORMAT_SUPPORT
+#define D3D_FORMAT_SUPPORT_DEPTH_STENCIL D3D11_FORMAT_SUPPORT_DEPTH_STENCIL
+#define D3D_FORMAT_SUPPORT_DISPLAY D3D11_FORMAT_SUPPORT_DISPLAY
+
 #define D3D_INPUT_PER_VERTEX_DATA D3D11_INPUT_PER_VERTEX_DATA
 
 #define D3D_BIND_INDEX_BUFFER D3D11_BIND_INDEX_BUFFER
@@ -342,6 +348,8 @@ typedef ID3D10Resource ID3DResource;
 #define D3D_CULL_FRONT D3D10_CULL_FRONT
 #define D3D_CULL_BACK D3D10_CULL_BACK
 
+#define D3D_CREATE_DEVICE_DEBUG D3D10_CREATE_DEVICE_DEBUG
+
 #define D3D_COMPARISON_NEVER D3D10_COMPARISON_NEVER
 #define D3D_COMPARISON_LESS D3D10_COMPARISON_LESS
 #define D3D_COMPARISON_EQUAL D3D10_COMPARISON_EQUAL
@@ -401,6 +409,10 @@ typedef ID3D10Resource ID3DResource;
 #define D3D_FILL_SOLID D3D10_FILL_SOLID
 #define D3D_FILL_WIREFRAME D3D10_FILL_WIREFRAME
 
+#define D3D_FORMAT_SUPPORT D3D10_FORMAT_SUPPORT
+#define D3D_FORMAT_SUPPORT_DEPTH_STENCIL D3D10_FORMAT_SUPPORT_DEPTH_STENCIL
+#define D3D_FORMAT_SUPPORT_DISPLAY D3D10_FORMAT_SUPPORT_DISPLAY
+
 #define D3D_INPUT_PER_VERTEX_DATA D3D10_INPUT_PER_VERTEX_DATA
 
 #define D3D_BIND_INDEX_BUFFER D3D10_BIND_INDEX_BUFFER

src/Layers/xrRenderDX10/dx10HW.cpp

@@ -7,6 +7,7 @@
 
 #include "StateManager/dx10SamplerStateCache.h"
 #include "StateManager/dx10StateCache.h"
+#include "dx10TextureUtils.h"
 
 CHW HW;
 
@@ -76,27 +77,84 @@ void CHW::CreateDevice(SDL_Window* m_sdlWnd)
     Caps.id_vendor = Desc.VendorId;
     Caps.id_device = Desc.DeviceId;
 
-    // Select back-buffer & depth-stencil format
-    D3DFORMAT& fTarget = Caps.fTarget;
-    D3DFORMAT& fDepth = Caps.fDepth;
+#if 0 // def DEBUG
+    UINT createDeviceFlags = D3D_CREATE_DEVICE_DEBUG;
+#else
+    UINT createDeviceFlags = 0;
+#endif
+
+    HRESULT R;
+
+#ifdef USE_DX11
+    D3D_FEATURE_LEVEL featureLevels[] =
+    {
+        D3D_FEATURE_LEVEL_11_1,
+        D3D_FEATURE_LEVEL_11_0,
+        D3D_FEATURE_LEVEL_10_1,
+        D3D_FEATURE_LEVEL_10_0,
+        D3D_FEATURE_LEVEL_9_3,
+        D3D_FEATURE_LEVEL_9_2,
+        D3D_FEATURE_LEVEL_9_1,
+    };
+
+    constexpr auto count = sizeof(featureLevels) / sizeof(featureLevels[0]);
+
+    const auto createDevice = [&](const D3D_FEATURE_LEVEL* level, const u32 levels)
+    {
+        return D3D11CreateDevice(m_pAdapter, D3D_DRIVER_TYPE_UNKNOWN,
+            nullptr, createDeviceFlags, level, levels,
+            D3D11_SDK_VERSION, &pDevice, &FeatureLevel, &pContext);
+    };
+
+    R = createDevice(featureLevels, count);
+    if (FAILED(R))
+        R = createDevice(&featureLevels[1], count - 1);
+#else
+    R = D3D10CreateDevice(m_pAdapter, m_DriverType, NULL, createDeviceFlags, D3D10_SDK_VERSION, &pDevice);
+
+    pContext = pDevice;
+    FeatureLevel = D3D_FEATURE_LEVEL_10_0;
+    if (!FAILED(R))
+    {
+        D3DX10GetFeatureLevel1(pDevice, &pDevice1);
+        FeatureLevel = D3D_FEATURE_LEVEL_10_1;
+    }
+    pContext1 = pDevice1;
+#endif
 
-    //  HACK: DX10: Embed hard target format.
-    fTarget = D3DFMT_X8R8G8B8; //   No match in DX10. D3DFMT_A8B8G8R8->DXGI_FORMAT_R8G8B8A8_UNORM
-    fDepth = selectDepthStencil(fTarget);
+    if (FAILED(R))
+    {
+        // Fatal error! Cannot create rendering device AT STARTUP !!!
+        Msg("Failed to initialize graphics hardware.\n"
+            "Please try to restart the game.\n"
+            "CreateDevice returned 0x%08x", R);
+        FlushLog();
+        MessageBox(nullptr, "Failed to initialize graphics hardware.\nPlease try to restart the game.", "Error!",
+            MB_OK | MB_ICONERROR);
+        TerminateProcess(GetCurrentProcess(), 0);
+    };
 
     // Set up the presentation parameters
     DXGI_SWAP_CHAIN_DESC& sd = m_ChainDesc;
     ZeroMemory(&sd, sizeof(sd));
 
+    // Back buffer
     sd.BufferDesc.Width = Device.dwWidth;
     sd.BufferDesc.Height = Device.dwHeight;
 
-    // Back buffer
-    //. P.BackBufferWidth       = dwWidth;
-    //. P.BackBufferHeight      = dwHeight;
     //  TODO: DX10: implement dynamic format selection
-    // sd.BufferDesc.Format     = fTarget;
-    sd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+    constexpr DXGI_FORMAT formats[] =
+    {
+        //DXGI_FORMAT_R16G16B16A16_FLOAT,
+        //DXGI_FORMAT_R10G10B10A2_UNORM,
+        //DXGI_FORMAT_B8G8R8X8_UNORM,
+        DXGI_FORMAT_R8G8B8A8_UNORM,
+    };
+
+    // Select back-buffer format
+    sd.BufferDesc.Format = SelectFormat(D3D_FORMAT_SUPPORT_DISPLAY, formats, std::size(formats));
+    Caps.fTarget = dx10TextureUtils::ConvertTextureFormat(sd.BufferDesc.Format);
+
     sd.BufferCount = 1;
 
     // Multisample
@@ -129,69 +187,13 @@ void CHW::CreateDevice(SDL_Window* m_sdlWnd)
 
     sd.Windowed = bWindowed;
 
-    // Depth/stencil (DX10 don't need this?)
-    //P.EnableAutoDepthStencil = TRUE;
-    //P.AutoDepthStencilFormat = fDepth;
-    //P.Flags = 0; //. D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL;
-
     //  Additional set up
     sd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
 
-    UINT createDeviceFlags = 0;
-#ifdef DEBUG
-    // createDeviceFlags |= D3Dxx_CREATE_DEVICE_DEBUG;
-#endif
-    HRESULT R;
-#ifdef USE_DX11
-    D3D_FEATURE_LEVEL featureLevels[] =
-    {
-        D3D_FEATURE_LEVEL_11_1,
-        D3D_FEATURE_LEVEL_11_0,
-        D3D_FEATURE_LEVEL_10_1,
-        D3D_FEATURE_LEVEL_10_0,
-        D3D_FEATURE_LEVEL_9_3,
-        D3D_FEATURE_LEVEL_9_2,
-        D3D_FEATURE_LEVEL_9_1,
-    };
-
-    R = D3D11CreateDevice(m_pAdapter,
-        D3D_DRIVER_TYPE_UNKNOWN, // Если мы выбираем конкретный адаптер, то мы обязаны использовать D3D_DRIVER_TYPE_UNKNOWN.
-        nullptr, createDeviceFlags, featureLevels, sizeof(featureLevels) / sizeof(featureLevels[0]),
-        D3D11_SDK_VERSION, &pDevice, &FeatureLevel, &pContext);
-
-    if (FAILED(R))
-        R = D3D11CreateDevice(m_pAdapter,
-            D3D_DRIVER_TYPE_UNKNOWN, // Если мы выбираем конкретный адаптер, то мы обязаны использовать D3D_DRIVER_TYPE_UNKNOWN.
-            nullptr, createDeviceFlags, &featureLevels[1], sizeof(featureLevels) / sizeof(featureLevels[0]) - 1,
-            D3D11_SDK_VERSION, &pDevice, &FeatureLevel, &pContext);
-#else
-    R = D3D10CreateDevice(m_pAdapter, m_DriverType, NULL, createDeviceFlags, D3D10_SDK_VERSION, &pDevice);
+    _SHOW_REF("* CREATE: DeviceREF:", HW.pDevice);
 
-    pContext = pDevice;
-    FeatureLevel = D3D_FEATURE_LEVEL_10_0;
-    if (!FAILED(R))
-    {
-        D3DX10GetFeatureLevel1(pDevice, &pDevice1);
-        FeatureLevel = D3D_FEATURE_LEVEL_10_1;
-    }
-    pContext1 = pDevice1;
-#endif
     R_CHK(m_pFactory->CreateSwapChain(pDevice, &sd, &m_pSwapChain));
 
-    if (FAILED(R))
-    {
-        // Fatal error! Cannot create rendering device AT STARTUP !!!
-        Msg("Failed to initialize graphics hardware.\n"
-            "Please try to restart the game.\n"
-            "CreateDevice returned 0x%08x", R);
-        FlushLog();
-        MessageBox(nullptr, "Failed to initialize graphics hardware.\nPlease try to restart the game.", "Error!",
-            MB_OK | MB_ICONERROR);
-        TerminateProcess(GetCurrentProcess(), 0);
-    };
-
-    _SHOW_REF("* CREATE: DeviceREF:", HW.pDevice);
-
     //  Create render target and depth-stencil views here
     UpdateViews();
 
@@ -258,6 +260,23 @@ void CHW::Reset()
     UpdateViews();
 }
 
+bool CHW::CheckFormatSupport(const DXGI_FORMAT format, const D3D_FORMAT_SUPPORT feature) const
+{
+    UINT feature_bit = feature;
+    if (SUCCEEDED(pDevice->CheckFormatSupport(format, &feature_bit)))
+        return true;
+    return false;
+}
+
+DXGI_FORMAT CHW::SelectFormat(D3D_FORMAT_SUPPORT feature, const DXGI_FORMAT formats[], size_t count) const
+{
+    for (u32 i = 0; i < count; ++i)
+        if (CheckFormatSupport(formats[i], feature))
+            return formats[i];
+
+    return DXGI_FORMAT_UNKNOWN;
+}
+
 D3DFORMAT CHW::selectDepthStencil(D3DFORMAT /*fTarget*/)
 {
 // R3 hack
@@ -278,7 +297,6 @@ void CHW::UpdateViews()
     HRESULT R;
 
     // Create a render target view
-    // R_CHK    (pDevice->GetRenderTarget           (0,&pBaseRT));
     ID3DTexture2D* pBuffer;
     R = m_pSwapChain->GetBuffer(0, __uuidof(ID3DTexture2D), (LPVOID*)&pBuffer);
     R_CHK(R);
@@ -288,17 +306,27 @@ void CHW::UpdateViews()
     R_CHK(R);
 
     //  Create Depth/stencil buffer
-    //  HACK: DX10: hard depth buffer format
-    // R_CHK    (pDevice->GetDepthStencilSurface    (&pBaseZB));
     ID3DTexture2D* pDepthStencil = NULL;
     D3D_TEXTURE2D_DESC descDepth;
     descDepth.Width = sd.BufferDesc.Width;
     descDepth.Height = sd.BufferDesc.Height;
     descDepth.MipLevels = 1;
     descDepth.ArraySize = 1;
-    descDepth.Format = DXGI_FORMAT_D24_UNORM_S8_UINT;
-    descDepth.SampleDesc.Count = 1;
-    descDepth.SampleDesc.Quality = 0;
+
+    // Select depth-stencil format
+    // TODO: DX10: test and support other formats
+    constexpr DXGI_FORMAT formats[] =
+    {
+        //DXGI_FORMAT_D32_FLOAT_S8X24_UINT,
+        DXGI_FORMAT_D24_UNORM_S8_UINT,
+        //DXGI_FORMAT_D32_FLOAT,
+        //DXGI_FORMAT_D16_UNORM
+    };
+    descDepth.Format = SelectFormat(D3D_FORMAT_SUPPORT_DEPTH_STENCIL, formats, std::size(formats));
+    Caps.fDepth = dx10TextureUtils::ConvertTextureFormat(descDepth.Format);
+
+    descDepth.SampleDesc.Count = sd.SampleDesc.Count;
+    descDepth.SampleDesc.Quality = sd.SampleDesc.Quality;
     descDepth.Usage = D3D_USAGE_DEFAULT;
     descDepth.BindFlags = D3D_BIND_DEPTH_STENCIL;
     descDepth.CPUAccessFlags = 0;
@@ -308,8 +336,18 @@ void CHW::UpdateViews()
         &pDepthStencil); // [out] Texture
     R_CHK(R);
 
+    D3D_DEPTH_STENCIL_VIEW_DESC descDSV;
+    ZeroMemory(&descDSV, sizeof(descDSV));
+
+    descDSV.Format = descDepth.Format;
+    if (descDepth.SampleDesc.Count > 1)
+        descDSV.ViewDimension = D3D_DSV_DIMENSION_TEXTURE2DMS;
+    else
+        descDSV.ViewDimension = D3D_DSV_DIMENSION_TEXTURE2D;
+    descDSV.Texture2D.MipSlice = 0;
+
     //  Create Depth/stencil view
-    R = pDevice->CreateDepthStencilView(pDepthStencil, NULL, &pBaseZB);
+    R = pDevice->CreateDepthStencilView(pDepthStencil, &descDSV, &pBaseZB);
     R_CHK(R);
 
     _RELEASE(pDepthStencil);

src/Layers/xrRenderDX10/dx10TextureUtils.cpp

@@ -65,6 +65,7 @@ TextureFormatPairs TextureFormatList[] = {
     // D3DFMT_D32 Not available
     // D3DFMT_D15S1 Not available
     // D3DFMT_D24S8 Not available
+    {D3DFMT_D24S8, DXGI_FORMAT_D24_UNORM_S8_UINT}, // XXX: documentation says that D3DFMT_D24S8 is unavailable
     {D3DFMT_D24X8, DXGI_FORMAT_R24G8_TYPELESS}, // DXGI_FORMAT_D24_UNORM_S8_UINT},	// Not available
     // D3DFMT_D24X4S4 Not available
     // D3DFMT_D16 DXGI_FORMAT_D16_UNORM
@@ -123,4 +124,17 @@ DXGI_FORMAT ConvertTextureFormat(D3DFORMAT dx9FMT)
     VERIFY(!"ConvertTextureFormat didn't find appropriate dx10 texture format!");
     return DXGI_FORMAT_UNKNOWN;
 }
+
+D3DFORMAT ConvertTextureFormat(DXGI_FORMAT dx10FMT)
+{
+    int arrayLength = sizeof(TextureFormatList) / sizeof(TextureFormatList[0]);
+    for (int i = 0; i < arrayLength; ++i)
+    {
+        if (TextureFormatList[i].m_dx10FMT == dx10FMT)
+            return TextureFormatList[i].m_dx9FMT;
+    }
+
+    VERIFY(!"ConvertTextureFormat didn't find appropriate dx9 texture format!");
+    return D3DFMT_UNKNOWN;
+}
 }

src/Layers/xrRenderDX10/dx10TextureUtils.h

@@ -5,6 +5,7 @@
 namespace dx10TextureUtils
 {
 DXGI_FORMAT ConvertTextureFormat(D3DFORMAT dx9FMT);
+D3DFORMAT ConvertTextureFormat(DXGI_FORMAT dx10FMT);
 }
 
 #endif //	dx10TextureUtils_included