From 0ae8cc44675d1962628317b34a50c775ce66d5e9 Mon Sep 17 00:00:00 2001 From: raven02 Date: Thu, 21 Jul 2016 14:50:06 +0800 Subject: [PATCH] D3D12: revert heap size back to 896M (#1960) * D3D12: revert heap size back to 896M * Update D3D12GSRender.h --- rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp | 3 +-- rpcs3/Emu/RSX/D3D12/D3D12GSRender.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp index 0535639e3a..0e14049564 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp @@ -167,7 +167,6 @@ D3D12GSRender::D3D12GSRender() // Adapter with specified name if (adapter_name == desc.Description) { - vram_size = desc.DedicatedVideoMemory != 0 ? desc.DedicatedVideoMemory : desc.DedicatedSystemMemory; break; } @@ -245,7 +244,7 @@ D3D12GSRender::D3D12GSRender() m_rtts.init(m_device.Get()); m_readback_resources.init(m_device.Get(), 1024 * 1024 * 128, D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_STATE_COPY_DEST); - m_buffer_data.init(m_device.Get(), std::min((size_t)(1024 * 1024 * 896), (size_t)(vram_size - (1024 * 1024 * 128))), D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_STATE_GENERIC_READ); + m_buffer_data.init(m_device.Get(), 1024 * 1024 * 896, D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_STATE_GENERIC_READ); CHECK_HRESULT( m_device->CreateCommittedResource( diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h index feae94fe70..3c0ef751ad 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.h @@ -121,7 +121,6 @@ private: u32 m_current_transform_constants_buffer_descriptor_id; ComPtr m_current_texture_descriptors; ComPtr m_current_sampler_descriptors; - size_t vram_size; public: D3D12GSRender();