Merge Fail. We don't disable BaseVertex on broken pinned memory.

dolphin-emu · Jan 1, 2014 · 0faf696 · 0faf696
1 parent d36355e
commit 0faf696
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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);