summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2016-08-19 11:04:45 +0200
committerGitHub <noreply@github.com>2016-08-19 11:04:45 +0200
commit31c530c7b3043a0673d8ec8694169d1accbb732f (patch)
tree54d3b015e71bb65e1134844c4313ae45b4155612 /Source/Core/VideoBackends/OGL/StreamBuffer.cpp
parent40f4308dc2120ce4e105008f3cb46b6a1c553e64 (diff)
parentfbc0aaf79672cd20c580a28ba765e4a07c2c8c67 (diff)
Merge pull request #3386 from lioncash/memory
Common: Namespace MemoryUtil
Diffstat (limited to 'Source/Core/VideoBackends/OGL/StreamBuffer.cpp')
-rw-r--r--Source/Core/VideoBackends/OGL/StreamBuffer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
index 1ed598b043..f0ede2d7d0 100644
--- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
+++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
@@ -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;
}