GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor RenderToolsDX to support new pixel formats properly

Browse Source
This commit is contained in:
Wojtek Figat
2024-04-24 17:35:58 +02:00
parent cdeb9a3b15
commit ebe05d4a51
4 changed files with 287 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Engine/Graphics/Graphics.Build.cs
View File

@@ -107,5 +107,12 @@ public class Graphics : EngineModule
{
options.PrivateDefinitions.Add("COMPILE_WITH_GPU_PARTICLES");
}
// Manually include file with shared DirectX code
if (options.PrivateDependencies.Contains("GraphicsDeviceDX11") ||
options.PrivateDependencies.Contains("GraphicsDeviceDX12"))
{
options.SourceFiles.Add(Path.Combine(FolderPath, "../GraphicsDevice/DirectX/RenderToolsDX.cpp"));
}
}
}

6
Source/Engine/GraphicsDevice/DirectX/DX11/GPUSwapChainDX11.cpp
View File

@@ -261,11 +261,7 @@ bool GPUSwapChainDX11::Resize(int32 width, int32 height)
_width = width;
_height = height;
#if PLATFORM_WINDOWS
_memoryUsage = RenderTools::CalculateTextureMemoryUsage(RenderToolsDX::ToPixelFormat(swapChainDesc.BufferDesc.Format), _width, _height, 1) * swapChainDesc.BufferCount;
#else
_memoryUsage = RenderTools::CalculateTextureMemoryUsage(RenderToolsDX::ToPixelFormat(swapChainDesc.Format), _width, _height, 1) * swapChainDesc.BufferCount;
#endif
_memoryUsage = RenderTools::CalculateTextureMemoryUsage(_format, _width, _height, 1) * swapChainDesc.BufferCount;
getBackBuffer();

274
Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.cpp Normal file
View File

@@ -0,0 +1,274 @@
// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
#if GRAPHICS_API_DIRECTX11 || GRAPHICS_API_DIRECTX12
#include "RenderToolsDX.h"
#include "Engine/Core/Types/StringBuilder.h"
#include "Engine/Graphics/GPUDevice.h"
#include <winerror.h>
// @formatter:off
DXGI_FORMAT PixelFormatToDXGIFormat[108] =
{
DXGI_FORMAT_UNKNOWN,
DXGI_FORMAT_R32G32B32A32_TYPELESS,
DXGI_FORMAT_R32G32B32A32_FLOAT,
DXGI_FORMAT_R32G32B32A32_UINT,
DXGI_FORMAT_R32G32B32A32_SINT,
DXGI_FORMAT_R32G32B32_TYPELESS,
DXGI_FORMAT_R32G32B32_FLOAT,
DXGI_FORMAT_R32G32B32_UINT,
DXGI_FORMAT_R32G32B32_SINT,
DXGI_FORMAT_R16G16B16A16_TYPELESS,
DXGI_FORMAT_R16G16B16A16_FLOAT,
DXGI_FORMAT_R16G16B16A16_UNORM,
DXGI_FORMAT_R16G16B16A16_UINT,
DXGI_FORMAT_R16G16B16A16_SNORM,
DXGI_FORMAT_R16G16B16A16_SINT,
DXGI_FORMAT_R32G32_TYPELESS,
DXGI_FORMAT_R32G32_FLOAT,
DXGI_FORMAT_R32G32_UINT,
DXGI_FORMAT_R32G32_SINT,
DXGI_FORMAT_R32G8X24_TYPELESS,
DXGI_FORMAT_D32_FLOAT_S8X24_UINT,
DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS,
DXGI_FORMAT_X32_TYPELESS_G8X24_UINT,
DXGI_FORMAT_R10G10B10A2_TYPELESS,
DXGI_FORMAT_R10G10B10A2_UNORM,
DXGI_FORMAT_R10G10B10A2_UINT,
DXGI_FORMAT_R11G11B10_FLOAT,
DXGI_FORMAT_R8G8B8A8_TYPELESS,
DXGI_FORMAT_R8G8B8A8_UNORM,
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB,
DXGI_FORMAT_R8G8B8A8_UINT,
DXGI_FORMAT_R8G8B8A8_SNORM,
DXGI_FORMAT_R8G8B8A8_SINT,
DXGI_FORMAT_R16G16_TYPELESS,
DXGI_FORMAT_R16G16_FLOAT,
DXGI_FORMAT_R16G16_UNORM,
DXGI_FORMAT_R16G16_UINT,
DXGI_FORMAT_R16G16_SNORM,
DXGI_FORMAT_R16G16_SINT,
DXGI_FORMAT_R32_TYPELESS,
DXGI_FORMAT_D32_FLOAT,
DXGI_FORMAT_R32_FLOAT,
DXGI_FORMAT_R32_UINT,
DXGI_FORMAT_R32_SINT,
DXGI_FORMAT_R24G8_TYPELESS,
DXGI_FORMAT_D24_UNORM_S8_UINT,
DXGI_FORMAT_R24_UNORM_X8_TYPELESS,
DXGI_FORMAT_X24_TYPELESS_G8_UINT,
DXGI_FORMAT_R8G8_TYPELESS,
DXGI_FORMAT_R8G8_UNORM,
DXGI_FORMAT_R8G8_UINT,
DXGI_FORMAT_R8G8_SNORM,
DXGI_FORMAT_R8G8_SINT,
DXGI_FORMAT_R16_TYPELESS,
DXGI_FORMAT_R16_FLOAT,
DXGI_FORMAT_D16_UNORM,
DXGI_FORMAT_R16_UNORM,
DXGI_FORMAT_R16_UINT,
DXGI_FORMAT_R16_SNORM,
DXGI_FORMAT_R16_SINT,
DXGI_FORMAT_R8_TYPELESS,
DXGI_FORMAT_R8_UNORM,
DXGI_FORMAT_R8_UINT,
DXGI_FORMAT_R8_SNORM,
DXGI_FORMAT_R8_SINT,
DXGI_FORMAT_A8_UNORM,
DXGI_FORMAT_R1_UNORM,
DXGI_FORMAT_R9G9B9E5_SHAREDEXP,
DXGI_FORMAT_R8G8_B8G8_UNORM,
DXGI_FORMAT_G8R8_G8B8_UNORM,
DXGI_FORMAT_BC1_TYPELESS,
DXGI_FORMAT_BC1_UNORM,
DXGI_FORMAT_BC1_UNORM_SRGB,
DXGI_FORMAT_BC2_TYPELESS,
DXGI_FORMAT_BC2_UNORM,
DXGI_FORMAT_BC2_UNORM_SRGB,
DXGI_FORMAT_BC3_TYPELESS,
DXGI_FORMAT_BC3_UNORM,
DXGI_FORMAT_BC3_UNORM_SRGB,
DXGI_FORMAT_BC4_TYPELESS,
DXGI_FORMAT_BC4_UNORM,
DXGI_FORMAT_BC4_SNORM,
DXGI_FORMAT_BC5_TYPELESS,
DXGI_FORMAT_BC5_UNORM,
DXGI_FORMAT_BC5_SNORM,
DXGI_FORMAT_B5G6R5_UNORM,
DXGI_FORMAT_B5G5R5A1_UNORM,
DXGI_FORMAT_B8G8R8A8_UNORM,
DXGI_FORMAT_B8G8R8X8_UNORM,
DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM,
DXGI_FORMAT_B8G8R8A8_TYPELESS,
DXGI_FORMAT_B8G8R8A8_UNORM_SRGB,
DXGI_FORMAT_B8G8R8X8_TYPELESS,
DXGI_FORMAT_B8G8R8X8_UNORM_SRGB,
DXGI_FORMAT_BC6H_TYPELESS,
DXGI_FORMAT_BC6H_UF16,
DXGI_FORMAT_BC6H_SF16,
DXGI_FORMAT_BC7_TYPELESS,
DXGI_FORMAT_BC7_UNORM,
DXGI_FORMAT_BC7_UNORM_SRGB,
DXGI_FORMAT_UNKNOWN, // ASTC_4x4_UNorm
DXGI_FORMAT_UNKNOWN, // ASTC_4x4_UNorm_sRGB
DXGI_FORMAT_UNKNOWN, // ASTC_6x6_UNorm
DXGI_FORMAT_UNKNOWN, // ASTC_6x6_UNorm_sRGB
DXGI_FORMAT_UNKNOWN, // ASTC_8x8_UNorm
DXGI_FORMAT_UNKNOWN, // ASTC_8x8_UNorm_sRGB
DXGI_FORMAT_UNKNOWN, // ASTC_10x10_UNorm
DXGI_FORMAT_UNKNOWN, // ASTC_10x10_UNorm_sRGB
};
// @formatter:on
DXGI_FORMAT RenderToolsDX::ToDxgiFormat(PixelFormat format)
{
return PixelFormatToDXGIFormat[(int32)format];
}
const Char* RenderToolsDX::GetFeatureLevelString(const D3D_FEATURE_LEVEL featureLevel)
{
switch (featureLevel)
{
case D3D_FEATURE_LEVEL_9_1:
return TEXT("9.1");
case D3D_FEATURE_LEVEL_9_2:
return TEXT("9.2");
case D3D_FEATURE_LEVEL_9_3:
return TEXT("9.3");
case D3D_FEATURE_LEVEL_10_0:
return TEXT("10");
case D3D_FEATURE_LEVEL_10_1:
return TEXT("10.1");
case D3D_FEATURE_LEVEL_11_0:
return TEXT("11");
case D3D_FEATURE_LEVEL_11_1:
return TEXT("11.1");
#if GRAPHICS_API_DIRECTX12
case D3D_FEATURE_LEVEL_12_0:
return TEXT("12");
case D3D_FEATURE_LEVEL_12_1:
return TEXT("12.1");
#endif
default:
return TEXT("?");
}
}
String RenderToolsDX::GetD3DErrorString(HRESULT errorCode)
{
StringBuilder sb(256);
// Switch error code
#define D3DERR(x) case x: sb.Append(TEXT(#x)); break
switch (errorCode)
{
// Windows
D3DERR(S_OK);
D3DERR(E_FAIL);
D3DERR(E_INVALIDARG);
D3DERR(E_OUTOFMEMORY);
D3DERR(E_NOINTERFACE);
D3DERR(E_NOTIMPL);
// DirectX
#if WITH_D3DX_LIBS
D3DERR(D3DERR_INVALIDCALL);
D3DERR(D3DERR_WASSTILLDRAWING);
#endif
// DirectX 11
D3DERR(D3D11_ERROR_FILE_NOT_FOUND);
D3DERR(D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS);
// DirectX 12
//D3DERR(D3D12_ERROR_FILE_NOT_FOUND);
//D3DERR(D3D12_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS);
//D3DERR(D3D12_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS);
// DXGI
D3DERR(DXGI_ERROR_INVALID_CALL);
D3DERR(DXGI_ERROR_NOT_FOUND);
D3DERR(DXGI_ERROR_MORE_DATA);
D3DERR(DXGI_ERROR_UNSUPPORTED);
D3DERR(DXGI_ERROR_DEVICE_REMOVED);
D3DERR(DXGI_ERROR_DEVICE_HUNG);
D3DERR(DXGI_ERROR_DEVICE_RESET);
D3DERR(DXGI_ERROR_WAS_STILL_DRAWING);
D3DERR(DXGI_ERROR_FRAME_STATISTICS_DISJOINT);
D3DERR(DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE);
D3DERR(DXGI_ERROR_DRIVER_INTERNAL_ERROR);
D3DERR(DXGI_ERROR_NONEXCLUSIVE);
D3DERR(DXGI_ERROR_NOT_CURRENTLY_AVAILABLE);
D3DERR(DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED);
D3DERR(DXGI_ERROR_REMOTE_OUTOFMEMORY);
D3DERR(DXGI_ERROR_ACCESS_LOST);
D3DERR(DXGI_ERROR_WAIT_TIMEOUT);
D3DERR(DXGI_ERROR_SESSION_DISCONNECTED);
D3DERR(DXGI_ERROR_RESTRICT_TO_OUTPUT_STALE);
D3DERR(DXGI_ERROR_CANNOT_PROTECT_CONTENT);
D3DERR(DXGI_ERROR_ACCESS_DENIED);
D3DERR(DXGI_ERROR_NAME_ALREADY_EXISTS);
D3DERR(DXGI_ERROR_SDK_COMPONENT_MISSING);
#if GRAPHICS_API_DIRECTX12
D3DERR(DXGI_ERROR_NOT_CURRENT);
D3DERR(DXGI_ERROR_HW_PROTECTION_OUTOFMEMORY);
D3DERR(D3D12_ERROR_DRIVER_VERSION_MISMATCH);
#endif
default:
{
sb.AppendFormat(TEXT("0x{0:x}"), static_cast<unsigned int>(errorCode));
}
break;
}
#undef D3DERR
if (errorCode == DXGI_ERROR_DEVICE_REMOVED || errorCode == DXGI_ERROR_DEVICE_RESET || errorCode == DXGI_ERROR_DRIVER_INTERNAL_ERROR)
{
HRESULT reason = S_OK;
const RendererType rendererType = GPUDevice::Instance ? GPUDevice::Instance->GetRendererType() : RendererType::Unknown;
void* nativePtr = GPUDevice::Instance ? GPUDevice::Instance->GetNativePtr() : nullptr;
#if GRAPHICS_API_DIRECTX12
if (rendererType == RendererType::DirectX12 && nativePtr)
{
reason = ((ID3D12Device*)nativePtr)->GetDeviceRemovedReason();
}
#endif
#if GRAPHICS_API_DIRECTX11
if ((rendererType == RendererType::DirectX11 ||
rendererType == RendererType::DirectX10_1 ||
rendererType == RendererType::DirectX10) && nativePtr)
{
reason = ((ID3D11Device*)nativePtr)->GetDeviceRemovedReason();
}
#endif
const Char* reasonStr = nullptr;
switch (reason)
{
case DXGI_ERROR_DEVICE_HUNG:
reasonStr = TEXT("HUNG");
break;
case DXGI_ERROR_DEVICE_REMOVED:
reasonStr = TEXT("REMOVED");
break;
case DXGI_ERROR_DEVICE_RESET:
reasonStr = TEXT("RESET");
break;
case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
reasonStr = TEXT("INTERNAL_ERROR");
break;
case DXGI_ERROR_INVALID_CALL:
reasonStr = TEXT("INVALID_CALL");
break;
}
if (reasonStr != nullptr)
sb.AppendFormat(TEXT(", Device Removed Reason: {0}"), reasonStr);
}
return sb.ToString();
}
#endif

163
Source/Engine/GraphicsDevice/DirectX/RenderToolsDX.h
View File

@@ -8,10 +8,7 @@
#include "Engine/Graphics//RenderTools.h"
#include "Engine/Graphics/Enums.h"
#include "IncludeDirectXHeaders.h"
#include "Engine/Core/Types/StringBuilder.h"
#include "Engine/Core/Log.h"
#include "Engine/Utilities/StringConverter.h"
#include <winerror.h>
/// <summary>
/// Set of utilities for rendering on DirectX platform.
@@ -61,25 +58,12 @@ namespace RenderToolsDX
#endif
/// <summary>
/// summary DXGI Pixel Format to the Flax Pixel Format.
/// </summary>
/// <param name="format">The DXGI format.</param>
/// <returns>The Flax Pixel Format</returns>
FORCE_INLINE PixelFormat ToPixelFormat(const DXGI_FORMAT format)
{
return static_cast<PixelFormat>(format);
}
/// <summary>
/// Converts Flax Pixel Format to the DXGI Format.
/// </summary>
/// <param name="format">The Flax Pixel Format.</param>
/// <returns>The DXGI Format</returns>
FORCE_INLINE DXGI_FORMAT ToDxgiFormat(const PixelFormat format)
{
return static_cast<DXGI_FORMAT>(format);
}
extern DXGI_FORMAT ToDxgiFormat(PixelFormat format);
// Aligns location to the next multiple of align value.
template<typename T>
@@ -89,34 +73,7 @@ namespace RenderToolsDX
return ((location + (align - 1)) & ~(align - 1));
}
static const Char* GetFeatureLevelString(const D3D_FEATURE_LEVEL featureLevel)
{
switch (featureLevel)
{
case D3D_FEATURE_LEVEL_9_1:
return TEXT("9.1");
case D3D_FEATURE_LEVEL_9_2:
return TEXT("9.2");
case D3D_FEATURE_LEVEL_9_3:
return TEXT("9.3");
case D3D_FEATURE_LEVEL_10_0:
return TEXT("10");
case D3D_FEATURE_LEVEL_10_1:
return TEXT("10.1");
case D3D_FEATURE_LEVEL_11_0:
return TEXT("11");
case D3D_FEATURE_LEVEL_11_1:
return TEXT("11.1");
#if GRAPHICS_API_DIRECTX12
case D3D_FEATURE_LEVEL_12_0:
return TEXT("12");
case D3D_FEATURE_LEVEL_12_1:
return TEXT("12.1");
#endif
default:
return TEXT("?");
}
}
extern const Char* GetFeatureLevelString(const D3D_FEATURE_LEVEL featureLevel);
// Calculate a subresource index for a texture
FORCE_INLINE uint32 CalcSubresourceIndex(uint32 mipSlice, uint32 arraySlice, uint32 mipLevels)
@@ -140,119 +97,7 @@ namespace RenderToolsDX
return count;
}
static String GetD3DErrorString(HRESULT errorCode)
{
StringBuilder sb(256);
// Switch error code
#define D3DERR(x) case x: sb.Append(TEXT(#x)); break
switch (errorCode)
{
// Windows
D3DERR(S_OK);
D3DERR(E_FAIL);
D3DERR(E_INVALIDARG);
D3DERR(E_OUTOFMEMORY);
D3DERR(E_NOINTERFACE);
D3DERR(E_NOTIMPL);
// DirectX
#if WITH_D3DX_LIBS
D3DERR(D3DERR_INVALIDCALL);
D3DERR(D3DERR_WASSTILLDRAWING);
#endif
// DirectX 11
D3DERR(D3D11_ERROR_FILE_NOT_FOUND);
D3DERR(D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS);
// DirectX 12
//D3DERR(D3D12_ERROR_FILE_NOT_FOUND);
//D3DERR(D3D12_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS);
//D3DERR(D3D12_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS);
// DXGI
D3DERR(DXGI_ERROR_INVALID_CALL);
D3DERR(DXGI_ERROR_NOT_FOUND);
D3DERR(DXGI_ERROR_MORE_DATA);
D3DERR(DXGI_ERROR_UNSUPPORTED);
D3DERR(DXGI_ERROR_DEVICE_REMOVED);
D3DERR(DXGI_ERROR_DEVICE_HUNG);
D3DERR(DXGI_ERROR_DEVICE_RESET);
D3DERR(DXGI_ERROR_WAS_STILL_DRAWING);
D3DERR(DXGI_ERROR_FRAME_STATISTICS_DISJOINT);
D3DERR(DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE);
D3DERR(DXGI_ERROR_DRIVER_INTERNAL_ERROR);
D3DERR(DXGI_ERROR_NONEXCLUSIVE);
D3DERR(DXGI_ERROR_NOT_CURRENTLY_AVAILABLE);
D3DERR(DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED);
D3DERR(DXGI_ERROR_REMOTE_OUTOFMEMORY);
D3DERR(DXGI_ERROR_ACCESS_LOST);
D3DERR(DXGI_ERROR_WAIT_TIMEOUT);
D3DERR(DXGI_ERROR_SESSION_DISCONNECTED);
D3DERR(DXGI_ERROR_RESTRICT_TO_OUTPUT_STALE);
D3DERR(DXGI_ERROR_CANNOT_PROTECT_CONTENT);
D3DERR(DXGI_ERROR_ACCESS_DENIED);
D3DERR(DXGI_ERROR_NAME_ALREADY_EXISTS);
D3DERR(DXGI_ERROR_SDK_COMPONENT_MISSING);
#if GRAPHICS_API_DIRECTX12
D3DERR(DXGI_ERROR_NOT_CURRENT);
D3DERR(DXGI_ERROR_HW_PROTECTION_OUTOFMEMORY);
D3DERR(D3D12_ERROR_DRIVER_VERSION_MISMATCH);
#endif
default:
{
sb.AppendFormat(TEXT("0x{0:x}"), static_cast<unsigned int>(errorCode));
}
break;
}
#undef D3DERR
if (errorCode == DXGI_ERROR_DEVICE_REMOVED || errorCode == DXGI_ERROR_DEVICE_RESET || errorCode == DXGI_ERROR_DRIVER_INTERNAL_ERROR)
{
HRESULT reason = S_OK;
const RendererType rendererType = GPUDevice::Instance ? GPUDevice::Instance->GetRendererType() : RendererType::Unknown;
void* nativePtr = GPUDevice::Instance ? GPUDevice::Instance->GetNativePtr() : nullptr;
#if GRAPHICS_API_DIRECTX12
if (rendererType == RendererType::DirectX12 && nativePtr)
{
reason = ((ID3D12Device*)nativePtr)->GetDeviceRemovedReason();
}
#endif
#if GRAPHICS_API_DIRECTX11
if ((rendererType == RendererType::DirectX11 ||
rendererType == RendererType::DirectX10_1 ||
rendererType == RendererType::DirectX10) && nativePtr)
{
reason = ((ID3D11Device*)nativePtr)->GetDeviceRemovedReason();
}
#endif
const Char* reasonStr = nullptr;
switch (reason)
{
case DXGI_ERROR_DEVICE_HUNG:
reasonStr = TEXT("HUNG");
break;
case DXGI_ERROR_DEVICE_REMOVED:
reasonStr = TEXT("REMOVED");
break;
case DXGI_ERROR_DEVICE_RESET:
reasonStr = TEXT("RESET");
break;
case DXGI_ERROR_DRIVER_INTERNAL_ERROR:
reasonStr = TEXT("INTERNAL_ERROR");
break;
case DXGI_ERROR_INVALID_CALL:
reasonStr = TEXT("INVALID_CALL");
break;
}
if (reasonStr != nullptr)
sb.AppendFormat(TEXT(", Device Removed Reason: {0}"), reasonStr);
}
return sb.ToString();
}
extern String GetD3DErrorString(HRESULT errorCode);
inline void ValidateD3DResult(HRESULT result, const char* file = "", uint32 line = 0)
{
@@ -286,6 +131,8 @@ namespace RenderToolsDX
#if GPU_ENABLE_DIAGNOSTICS || COMPILE_WITH_SHADER_COMPILER
#include "Engine/Utilities/StringConverter.h"
// Link DXGI lib
#pragma comment(lib, "dxguid.lib")