From 32b2000d9bd413cacfb06bbef4ddacab07d77cae Mon Sep 17 00:00:00 2001
From: Ansgar Philippsen <ansgar.philippsen@gmail.com>
Date: Wed, 13 Jun 2012 16:55:19 -0400
Subject: [PATCH] fixed bad bug in gfx/glew initialization introduced with last
mesa patch
---
modules/gfx/src/glext_include.hh | 2 +-
modules/gfx/src/shader.cc | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/gfx/src/glext_include.hh b/modules/gfx/src/glext_include.hh
index 183f6112c..557dcb360 100644
--- a/modules/gfx/src/glext_include.hh
+++ b/modules/gfx/src/glext_include.hh
@@ -29,7 +29,7 @@
#include <ost/config.hh>
#if OST_SHADER_SUPPORT_ENABLED
-#ifdef OST_MESA_SUPPORT_ENABLED
+#if OST_MESA_SUPPORT_ENABLED
# define OST_GL_VERSION_2_0 1
# define GL_GLEXT_PROTOTYPES 1
# include <GL/gl.h>
diff --git a/modules/gfx/src/shader.cc b/modules/gfx/src/shader.cc
index c3b8b1d79..80d375ce4 100644
--- a/modules/gfx/src/shader.cc
+++ b/modules/gfx/src/shader.cc
@@ -51,7 +51,7 @@ Shader::Shader():
shader_program_map_()
{
if(!OST_GL_VERSION_2_0) {
- LOG_VERBOSE("OpenGL version smaller 2.0, deactivating shader functionality");
+ LOG_VERBOSE("OpenGL version less than 2.0, deactivating shader functionality");
}
}
@@ -59,7 +59,9 @@ Shader::Shader():
void Shader::PreGLInit()
{
#if !defined(__APPLE__)
-#if !defined(OST_MESA_SUPPORT_ENABLED)
+#if OST_MESA_SUPPORT_ENABLED
+ // skip glew initialization
+#else
GLenum err = glewInit();
if (GLEW_OK != err) {
LOG_ERROR("glew failure: " << glewGetErrorString(err));
--
GitLab