Permalink
Browse files

Enable the OpenGL 1.4/VBO fallback on Macs.

Removes some ifdefs that were cargo culted along for years. Rejoice,
Intel GMA 950 users! Refs #3166.
  • Loading branch information...
1 parent 4f72225 commit b38b2f5f1724d656e3a81623b29563d6cdefdb12 @cybersphinx cybersphinx committed Feb 27, 2012
Showing with 1 addition and 5 deletions.
  1. +1 −5 lib/ivis_opengl/screen.cpp
@@ -145,15 +145,13 @@ bool screenInitialise()
}
else // less than 1.5
{
-#ifndef WZ_OS_MAC
// Check if VBO extension available for haxx
if (GLEW_VERSION_1_4 && GLEW_ARB_vertex_buffer_object)
{
debug(LOG_POPUP, _("OpenGL 1.5/2.0 is not supported by your system. Some things may look wrong. Please upgrade your graphics driver/hardware, if possible."));
// screen_EnableVBO should be called later, so nothing (quesoGLC) will call glewInit twice and flush our tweaks into void
}
else
-#endif
{
debug(LOG_FATAL, _("OpenGL 1.4 + VBO extension is not supported by your system. The game requires this. Please upgrade your graphics drivers/hardware, if possible."));
exit(1);
@@ -173,10 +171,9 @@ void screenShutDown(void)
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_ACCUM_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
}
-// Make OpenGL's VBO functions available under the core names for implementations that have them only as extensions, namely Mesa.
+// Make OpenGL's VBO functions available under the core names for drivers that support OpenGL 1.4 only but have the VBO extension
void screen_EnableVBO()
{
-#ifndef WZ_OS_MAC
// no need if there is OpenGL 1.5 available
if (!GLEW_VERSION_1_5 && GLEW_ARB_vertex_buffer_object)
{
@@ -194,7 +191,6 @@ void screen_EnableVBO()
__glewMapBuffer = __glewMapBufferARB;
__glewUnmapBuffer = __glewUnmapBufferARB;
}
-#endif
}
void screen_SetBackDropFromFile(const char* filename)

0 comments on commit b38b2f5

Please sign in to comment.