piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Disable primitive restart on buggy OS X Intel HD 3000 drivers.

Browse Source
This commit is contained in:
Ryan Houdek
2013-12-30 18:26:55 -06:00
parent de16b7207c
commit 6d63db96e9
3 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/VideoBackends/OGL/Src/Render.cpp
View File

@ -260,6 +260,7 @@ void InitDriverInfo()
DriverDetails::Vendor vendor = DriverDetails::VENDOR_UNKNOWN;
DriverDetails::Driver driver = DriverDetails::DRIVER_UNKNOWN;
double version = 0.0;
u32 family = 0;
// Get the vendor first
if (svendor == "NVIDIA Corporation" && srenderer != "NVIDIA Tegra")
@ -321,11 +322,23 @@ void InitDriverInfo()
version = 100*major + 10*minor + release;
}
break;
case DriverDetails::VENDOR_INTEL: // Happens in OS X
sscanf(g_ogl_config.gl_renderer, "Intel HD Graphics %d", &family);
/*
int glmajor = 0;
int glminor = 0;
int major = 0;
int minor = 0;
int release = 0;
sscanf(g_ogl_config.gl_version, "%d.%d INTEL-%d.%d.%d", &glmajor, &glminor, &major, &minor, &release);
version = 10000*major + 1000*minor + release;
*/
break;
// We don't care about these
default:
break;
}
DriverDetails::Init(vendor, driver, version);
DriverDetails::Init(vendor, driver, version, family);
}
// Init functions
@ -466,7 +479,8 @@ Renderer::Renderer()
g_Config.backend_info.bSupportsDualSourceBlend = TO_BOOL(GLEW_ARB_blend_func_extended);
g_Config.backend_info.bSupportsGLSLUBO = TO_BOOL(GLEW_ARB_uniform_buffer_object);
g_Config.backend_info.bSupportsPrimitiveRestart = TO_BOOL(GLEW_VERSION_3_1) || TO_BOOL(GLEW_NV_primitive_restart);
g_Config.backend_info.bSupportsPrimitiveRestart = !DriverDetails::HasBug(DriverDetails::BUG_PRIMITIVERESTART) &&
(TO_BOOL(GLEW_VERSION_3_1) || TO_BOOL(GLEW_NV_primitive_restart));
g_Config.backend_info.bSupportsEarlyZ = TO_BOOL(GLEW_ARB_shader_image_load_store);
g_ogl_config.bSupportsGLSLCache = TO_BOOL(GLEW_ARB_get_program_binary);