From 0faf696be772e003931097ebf980028321337910 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Wed, 1 Jan 2014 17:20:09 -0600 Subject: [PATCH] Merge Fail. We don't disable BaseVertex on broken pinned memory. --- Source/Core/VideoBackends/OGL/Render.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 8a7c499192..2013fa5c55 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -486,8 +486,7 @@ Renderer::Renderer() g_ogl_config.bSupportsGLSLCache = TO_BOOL(GLEW_ARB_get_program_binary); g_ogl_config.bSupportsGLPinnedMemory = TO_BOOL(GLEW_AMD_pinned_memory); g_ogl_config.bSupportsGLSync = TO_BOOL(GLEW_ARB_sync); - g_ogl_config.bSupportsGLBaseVertex = TO_BOOL(GLEW_ARB_draw_elements_base_vertex) && - !DriverDetails::HasBug(DriverDetails::BUG_BROKENPINNEDMEMORY); + g_ogl_config.bSupportsGLBaseVertex = TO_BOOL(GLEW_ARB_draw_elements_base_vertex); g_ogl_config.bSupportsGLBufferStorage = TO_BOOL(GLEW_ARB_buffer_storage); g_ogl_config.bSupportCoverageMSAA = TO_BOOL(GLEW_NV_framebuffer_multisample_coverage); g_ogl_config.bSupportSampleShading = TO_BOOL(GLEW_ARB_sample_shading);