piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3386 from lioncash/memory

Browse Source 
Common: Namespace MemoryUtil
This commit is contained in:
JosJuice
2016-08-19 11:04:45 +02:00
committed by GitHub
parent 40f4308dc2 fbc0aaf796
commit 31c530c7b3
15 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoBackends/OGL/StreamBuffer.cpp
View File

@ -261,8 +261,8 @@ public:
PinnedMemory(u32 type, u32 size) : StreamBuffer(type, size)
{
CreateFences();
m_pointer =
(u8*)AllocateAlignedMemory(ROUND_UP(m_size, ALIGN_PINNED_MEMORY), ALIGN_PINNED_MEMORY);
m_pointer = static_cast<u8*>(
Common::AllocateAlignedMemory(ROUND_UP(m_size, ALIGN_PINNED_MEMORY), ALIGN_PINNED_MEMORY));
glBindBuffer(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, m_buffer);
glBufferData(GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD, ROUND_UP(m_size, ALIGN_PINNED_MEMORY),
m_pointer, GL_STREAM_COPY);
@ -275,7 +275,7 @@ public:
DeleteFences();
glBindBuffer(m_buffertype, 0);
glFinish(); // ogl pipeline must be flushed, else this buffer can be in use
FreeAlignedMemory(m_pointer);
Common::FreeAlignedMemory(m_pointer);
m_pointer = nullptr;
}