From 30f93ab4186bd69bd39bce015907753e9665ccd3 Mon Sep 17 00:00:00 2001 From: Justin Chadwick Date: Thu, 3 Jul 2014 20:35:13 -0400 Subject: [PATCH] Place pinned memory as top priority --- Source/Core/VideoBackends/OGL/StreamBuffer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp index 5723283b72..cbcf210957 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp @@ -346,16 +346,16 @@ StreamBuffer* StreamBuffer::Create(u32 type, u32 size) // Prefer the syncing buffers over the orphaning one if (g_ogl_config.bSupportsGLSync) { - // try to use buffer storage whenever possible - if (g_ogl_config.bSupportsGLBufferStorage && - !(DriverDetails::HasBug(DriverDetails::BUG_BROKENBUFFERSTORAGE) && type == GL_ARRAY_BUFFER)) - return new BufferStorage(type, size); - - // pinned memory is almost as fine + // pinned memory is much faster on amd cards if (g_ogl_config.bSupportsGLPinnedMemory && !(DriverDetails::HasBug(DriverDetails::BUG_BROKENPINNEDMEMORY) && type == GL_ELEMENT_ARRAY_BUFFER)) return new PinnedMemory(type, size); + // buffer storage works well in most situations + if (g_ogl_config.bSupportsGLBufferStorage && + !(DriverDetails::HasBug(DriverDetails::BUG_BROKENBUFFERSTORAGE) && type == GL_ARRAY_BUFFER)) + return new BufferStorage(type, size); + // don't fall back to MapAnd* for nvidia drivers if (DriverDetails::HasBug(DriverDetails::BUG_BROKENUNSYNCMAPPING)) return new BufferSubData(type, size);