rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-15 07:29:17 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Fixed potential memory allocation issue

Browse Source
This commit is contained in:
Philip Rebohle 2018-03-01 07:29:05 +01:00
parent d74db72add
commit dbe3662bfc
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dxvk/dxvk_memory.cpp
View File

@ -162,9 +162,12 @@ namespace dxvk {
// chunks since that might lead to severe fragmentation. // chunks since that might lead to severe fragmentation.
if (size >= (m_chunkSize / 4)) { if (size >= (m_chunkSize / 4)) {
VkDeviceMemory memory = this->allocDeviceMemory(size); VkDeviceMemory memory = this->allocDeviceMemory(size);
void* mapPtr = this->mapDeviceMemory(memory);
return DxvkMemory(nullptr, this, memory, 0, size, mapPtr); if (memory == VK_NULL_HANDLE)
return DxvkMemory();
return DxvkMemory(nullptr, this, memory,
0, size, this->mapDeviceMemory(memory));
} else { } else {
std::lock_guard<std::mutex> lock(m_mutex); std::lock_guard<std::mutex> lock(m_mutex);
@ -179,10 +182,12 @@ namespace dxvk {
// None of the existing chunks could satisfy // None of the existing chunks could satisfy
// the request, we need to create a new one // the request, we need to create a new one
VkDeviceMemory chunkMem = this->allocDeviceMemory(m_chunkSize); VkDeviceMemory chunkMem = this->allocDeviceMemory(m_chunkSize);
void* chunkPtr = this->mapDeviceMemory(chunkMem);
Rc<DxvkMemoryChunk> newChunk = new DxvkMemoryChunk( if (chunkMem == VK_NULL_HANDLE)
this, chunkMem, chunkPtr, m_chunkSize); return DxvkMemory();
Rc<DxvkMemoryChunk> newChunk = new DxvkMemoryChunk(this,
chunkMem, this->mapDeviceMemory(chunkMem), m_chunkSize);
DxvkMemory memory = newChunk->alloc(size, align); DxvkMemory memory = newChunk->alloc(size, align);
m_chunks.push_back(std::move(newChunk)); m_chunks.push_back(std::move(newChunk));