fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[D3D12] Fix Vulkan branch merge error

Browse Source
This commit is contained in:
Triang3l
2020-09-18 21:26:24 +03:00
parent a53a5217a3
commit 36347ffedd
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/ui/d3d12/d3d12_provider.cc
View File

@@ -417,14 +417,6 @@ bool D3D12Provider::Initialize() {
virtual_address_bits_per_resource_ = virtual_address_bits_per_resource_ =
virtual_address_support.MaxGPUVirtualAddressBitsPerResource; virtual_address_support.MaxGPUVirtualAddressBitsPerResource;
} }
// D3D12_HEAP_FLAG_CREATE_NOT_ZEROED requires Windows 10 2004 (indicated by
// the availability of ID3D12Device8 or D3D12_FEATURE_D3D12_OPTIONS7).
heap_flag_create_not_zeroed_ = D3D12_HEAP_FLAG_NONE;
D3D12_FEATURE_DATA_D3D12_OPTIONS7 options7;
if (SUCCEEDED(device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS7,
&options7, sizeof(options7)))) {
heap_flag_create_not_zeroed_ = D3D12_HEAP_FLAG_CREATE_NOT_ZEROED;
}
XELOGD3D( XELOGD3D(
"Direct3D 12 device and OS features:\n" "Direct3D 12 device and OS features:\n"
"* Max GPU virtual address bits per resource: {}\n" "* Max GPU virtual address bits per resource: {}\n"

4
src/xenia/ui/d3d12/d3d12_provider.h
View File

@@ -87,9 +87,6 @@ class D3D12Provider : public GraphicsProvider {
uint32_t GetVirtualAddressBitsPerResource() const { uint32_t GetVirtualAddressBitsPerResource() const {
return virtual_address_bits_per_resource_; return virtual_address_bits_per_resource_;
} }
D3D12_HEAP_FLAGS GetHeapFlagCreateNotZeroed() const {
return heap_flag_create_not_zeroed_;
}
// Proxies for Direct3D 12 functions since they are loaded dynamically. // Proxies for Direct3D 12 functions since they are loaded dynamically.
inline HRESULT SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC* desc, inline HRESULT SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC* desc,
@@ -171,7 +168,6 @@ class D3D12Provider : public GraphicsProvider {
D3D12_RESOURCE_BINDING_TIER resource_binding_tier_; D3D12_RESOURCE_BINDING_TIER resource_binding_tier_;
D3D12_TILED_RESOURCES_TIER tiled_resources_tier_; D3D12_TILED_RESOURCES_TIER tiled_resources_tier_;
uint32_t virtual_address_bits_per_resource_; uint32_t virtual_address_bits_per_resource_;
D3D12_HEAP_FLAGS heap_flag_create_not_zeroed_;
}; };
} // namespace d3d12 } // namespace d3d12