diff --git a/renderdoc/driver/d3d11/d3d11_common.cpp b/renderdoc/driver/d3d11/d3d11_common.cpp index ee57a88e9..9361f6a7b 100644 --- a/renderdoc/driver/d3d11/d3d11_common.cpp +++ b/renderdoc/driver/d3d11/d3d11_common.cpp @@ -453,15 +453,6 @@ ResourceRange::ResourceRange(ID3D11Resource *res, UINT mip, UINT slice) stencilReadOnly = false; } -D3D11InitParams::D3D11InitParams() -{ - DriverType = D3D_DRIVER_TYPE_UNKNOWN; - Flags = 0; - SDKVersion = D3D11_SDK_VERSION; - NumFeatureLevels = 0; - RDCEraseEl(FeatureLevels); -} - bool D3D11InitParams::IsSupportedVersion(uint64_t ver) { if(ver == CurrentVersion) diff --git a/renderdoc/driver/d3d11/d3d11_device.h b/renderdoc/driver/d3d11/d3d11_device.h index 1c38b7eb7..4fa4a1634 100644 --- a/renderdoc/driver/d3d11/d3d11_device.h +++ b/renderdoc/driver/d3d11/d3d11_device.h @@ -54,15 +54,13 @@ enum TextureDisplayType struct D3D11InitParams { - D3D11InitParams(); + D3D_DRIVER_TYPE DriverType = D3D_DRIVER_TYPE_UNKNOWN; + UINT Flags = 0; + UINT SDKVersion = D3D11_SDK_VERSION; + UINT NumFeatureLevels = 0; + D3D_FEATURE_LEVEL FeatureLevels[16] = {}; - D3D_DRIVER_TYPE DriverType; - UINT Flags; - UINT SDKVersion; - UINT NumFeatureLevels; - D3D_FEATURE_LEVEL FeatureLevels[16]; - - DXGI_ADAPTER_DESC AdapterDesc; + DXGI_ADAPTER_DESC AdapterDesc = {}; // check if a frame capture section version is supported static const uint64_t CurrentVersion = 0x11; diff --git a/renderdoc/driver/d3d12/d3d12_common.cpp b/renderdoc/driver/d3d12/d3d12_common.cpp index 531b4df41..f67988fbe 100644 --- a/renderdoc/driver/d3d12/d3d12_common.cpp +++ b/renderdoc/driver/d3d12/d3d12_common.cpp @@ -184,11 +184,6 @@ HRESULT EnumAdapterByLuid(IDXGIFactory1 *factory, LUID luid, IDXGIAdapter **pAda return E_FAIL; } -D3D12InitParams::D3D12InitParams() -{ - MinimumFeatureLevel = D3D_FEATURE_LEVEL_11_0; -} - bool D3D12InitParams::IsSupportedVersion(uint64_t ver) { if(ver == CurrentVersion) diff --git a/renderdoc/driver/d3d12/d3d12_device.h b/renderdoc/driver/d3d12/d3d12_device.h index 37373b0d2..06d00deb2 100644 --- a/renderdoc/driver/d3d12/d3d12_device.h +++ b/renderdoc/driver/d3d12/d3d12_device.h @@ -41,11 +41,9 @@ struct IAmdExtD3DFactory; struct D3D12InitParams { - D3D12InitParams(); + D3D_FEATURE_LEVEL MinimumFeatureLevel = D3D_FEATURE_LEVEL_11_0; - D3D_FEATURE_LEVEL MinimumFeatureLevel; - - DXGI_ADAPTER_DESC AdapterDesc; + DXGI_ADAPTER_DESC AdapterDesc = {}; // check if a frame capture section version is supported static const uint64_t CurrentVersion = 0x8;