From 30eb43a284ff4cba12b21f91acd3e0ea900a2486 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Thu, 11 Jan 2018 19:06:58 +0100 Subject: [PATCH] [dxvk] Minor memory management tweaks --- src/dxvk/dxvk_descriptor.cpp | 3 +-- src/dxvk/dxvk_device.h | 2 +- src/dxvk/dxvk_memory.cpp | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/dxvk/dxvk_descriptor.cpp b/src/dxvk/dxvk_descriptor.cpp index 24db9dc7..69acda1e 100644 --- a/src/dxvk/dxvk_descriptor.cpp +++ b/src/dxvk/dxvk_descriptor.cpp @@ -21,8 +21,7 @@ namespace dxvk { VkDescriptorSet DxvkDescriptorAlloc::alloc(VkDescriptorSetLayout layout) { -// VkDescriptorSet set = allocFrom(m_pools[m_poolId], layout); - VkDescriptorSet set = VK_NULL_HANDLE; + VkDescriptorSet set = allocFrom(m_pools[m_poolId], layout); if (set == VK_NULL_HANDLE) { if (++m_poolId >= m_pools.size()) diff --git a/src/dxvk/dxvk_device.h b/src/dxvk/dxvk_device.h index e63750ce..42680b82 100644 --- a/src/dxvk/dxvk_device.h +++ b/src/dxvk/dxvk_device.h @@ -33,7 +33,7 @@ namespace dxvk { class DxvkDevice : public RcObject { friend class DxvkSubmissionQueue; - constexpr static VkDeviceSize DefaultStagingBufferSize = 16 * 1024 * 1024; + constexpr static VkDeviceSize DefaultStagingBufferSize = 4 * 1024 * 1024; public: DxvkDevice( diff --git a/src/dxvk/dxvk_memory.cpp b/src/dxvk/dxvk_memory.cpp index 9cf75c6a..1ae09e69 100644 --- a/src/dxvk/dxvk_memory.cpp +++ b/src/dxvk/dxvk_memory.cpp @@ -59,14 +59,12 @@ namespace dxvk { m_memory(memory), m_mapPtr(mapPtr), m_size (size) { - TRACE(this, heap, size); // Mark the entire chunk as free m_freeList.push_back(FreeSlice { 0, size }); } DxvkMemoryChunk::~DxvkMemoryChunk() { - TRACE(this); m_heap->freeDeviceMemory(m_memory); }