From 6cc30f3b236189ef142ac7606c6e0b70c8b67582 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 18 Sep 2013 02:23:47 +0200 Subject: [PATCH] Revert "ogl: change the default buffer upload on osx+nvidia" This reverts commit 3b0b5155e8335d3645ed5860682ecb1975d8c342. It seems that both unsync upload methods are broken on osx+nvidia, so switch back to the default one :-( --- Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp index 89c3cd0f28..814a628d1c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp @@ -21,12 +21,8 @@ StreamBuffer::StreamBuffer(u32 type, size_t size, StreamType uploadType) { glGenBuffers(1, &m_buffer); - bool nvidia = false; + bool nvidia = !strcmp(g_ogl_config.gl_vendor, "NVIDIA Corporation"); -#ifndef __APPLE__ - // OSX also reports to be nvidia, but the driver is self written and doesn't act like the windows nvidia driver. - nvidia = !strcmp(g_ogl_config.gl_vendor, "NVIDIA Corporation"); -#endif if(m_uploadtype & STREAM_DETECT) { // TODO: move this to InitBackendInfo