From b81217754cccc48148b633fb1f1f3e92f65b89a6 Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Thu, 16 May 2019 01:15:53 +0200
Subject: [PATCH] remove MESA support
hasn't been used/tested for years
---
CMakeLists.txt | 11 +----------
modules/config/CMakeLists.txt | 6 ------
modules/config/config.hh.in | 1 -
modules/doc/install.rst | 2 --
modules/gfx/src/CMakeLists.txt | 19 +++++++------------
modules/gfx/src/glext_include.hh | 7 -------
modules/gfx/src/shader.cc | 14 +++++---------
7 files changed, 13 insertions(+), 47 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a337afebb..f387887e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,8 +34,6 @@ option(ENABLE_GUI "whether the graphical user interface should be enabled"
ON)
option(ENABLE_GFX "whether graphics support should be enabled"
ON)
-option(USE_MESA "use software rendered Mesa instead of hardware GL"
- OFF)
option(ENABLE_IMG "whether the image processing module should be compiled"
ON)
option(ENABLE_INFO "whether openstructure should be compiled with support for the info library"
@@ -218,13 +216,7 @@ else()
endif()
endif()
if (ENABLE_GFX)
- if(USE_MESA)
- find_package(Mesa REQUIRED)
- set(_USE_MESA ON)
- else()
- find_package(OpenGL REQUIRED)
- set(_USE_MESA OFF)
- endif()
+ find_package(OpenGL REQUIRED)
endif()
if (ENABLE_IMG OR ENABLE_GFX)
@@ -359,7 +351,6 @@ message(STATUS
" Info support (-DENABLE_INFO) : ${_INFO}\n"
" Graphical interface (-DENABLE_GUI) : ${_UI}\n"
" OpenGL support (-DENABLE_GFX) : ${_OPENGL}\n"
- " OpenGL via Mesa (-DUSE_MESA) : ${_USE_MESA}\n"
" Image Processing support (-DENABLE_IMG) : ${_IMG}\n"
" Shader support (-DUSE_SHADER) : ${_SHADER}\n"
" Numpy support (-DUSE_NUMPY) : ${_NUMPY}\n"
diff --git a/modules/config/CMakeLists.txt b/modules/config/CMakeLists.txt
index 391a70c9a..e6588b170 100644
--- a/modules/config/CMakeLists.txt
+++ b/modules/config/CMakeLists.txt
@@ -16,12 +16,6 @@ else()
set(shader_support 0)
endif()
-if (USE_MESA)
- set(mesa_support 1)
-else()
- set(mesa_support 0)
-endif()
-
if (USE_NUMPY)
set(numpy_support 1)
else()
diff --git a/modules/config/config.hh.in b/modules/config/config.hh.in
index 5a5b2bb4c..7e8a96579 100644
--- a/modules/config/config.hh.in
+++ b/modules/config/config.hh.in
@@ -24,7 +24,6 @@
*/
#define OST_SHADER_SUPPORT_ENABLED @shader_support@
-#define OST_MESA_SUPPORT_ENABLED @mesa_support@
#define OST_PROFILING_ENABLED @profiling_enabled@
#define OST_ANIMATIONS_ENABLED @animations_enabled@
#define OST_IMG_ENABLED @img_enabled@
diff --git a/modules/doc/install.rst b/modules/doc/install.rst
index 644cf503e..1caff8a66 100644
--- a/modules/doc/install.rst
+++ b/modules/doc/install.rst
@@ -247,8 +247,6 @@ Build Options
* Experimental settings (only change if you know what you are doing):
- * `USE_MESA` to use software rendered Mesa instead of hardware GL. By default,
- this is turned off.
* `USE_SHADER` controls whether to compile with shader support. By default,
this is turned off.
* `ENABLE_SPNAV` controls whether 3DConnexion devices should be supported. By
diff --git a/modules/gfx/src/CMakeLists.txt b/modules/gfx/src/CMakeLists.txt
index fd1c54ebf..acd3f9eb4 100644
--- a/modules/gfx/src/CMakeLists.txt
+++ b/modules/gfx/src/CMakeLists.txt
@@ -187,15 +187,13 @@ if (USE_SHADER)
list(APPEND OST_GFX_SOURCES impl/scene_fx.cc)
list(APPEND OST_GFX_IMPL_HEADERS scene_fx.hh)
if (NOT APPLE)
- if (NOT USE_MESA)
- set(OST_GLEW_HEADERS
- glew.h
- glxew.h
- wglew.h IN_DIR GL
- )
- list(APPEND OST_GFX_SOURCES GL/glew.c)
- include_directories("${STAGE_DIR}/include/ost/gfx")
- endif()
+ set(OST_GLEW_HEADERS
+ glew.h
+ glxew.h
+ wglew.h IN_DIR GL
+ )
+ list(APPEND OST_GFX_SOURCES GL/glew.c)
+ include_directories("${STAGE_DIR}/include/ost/gfx")
endif()
endif()
@@ -215,9 +213,6 @@ module(NAME gfx SOURCES ${OST_GFX_SOURCES} ${OST_GFX_MAP_SOURCES}
include_directories(${PNG_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
# link against OpenGL and PNG libraries
-if(USE_MESA)
- link_directories(${OPENGL_LIBRARY_DIR})
-endif()
target_link_libraries(ost_gfx ${OPENGL_LIBRARIES} ${PNG_LIBRARIES})
if (USE_SHADER)
diff --git a/modules/gfx/src/glext_include.hh b/modules/gfx/src/glext_include.hh
index 557dcb360..4bc9decae 100644
--- a/modules/gfx/src/glext_include.hh
+++ b/modules/gfx/src/glext_include.hh
@@ -29,12 +29,6 @@
#include <ost/config.hh>
#if OST_SHADER_SUPPORT_ENABLED
-#if OST_MESA_SUPPORT_ENABLED
-# define OST_GL_VERSION_2_0 1
-# define GL_GLEXT_PROTOTYPES 1
-# include <GL/gl.h>
-# include <GL/glext.h>
-#else
# if OST_MODULE==OST_GFX
# define GLEW_BUILD
# endif
@@ -45,7 +39,6 @@
# include <ost/gfx/GL/wglew.h>
# endif
#endif
-#endif
#include <ost/gfx/gl_include.hh>
diff --git a/modules/gfx/src/shader.cc b/modules/gfx/src/shader.cc
index f514aeebf..03f88696b 100644
--- a/modules/gfx/src/shader.cc
+++ b/modules/gfx/src/shader.cc
@@ -59,15 +59,11 @@ Shader::Shader():
void Shader::PreGLInit()
{
#if !defined(__APPLE__)
-#if OST_MESA_SUPPORT_ENABLED
- // skip glew initialization
-#else
- GLenum err = glewInit();
- if (GLEW_OK != err) {
- LOG_ERROR("glew failure: " << glewGetErrorString(err));
- assert(false);
- }
-#endif
+GLenum err = glewInit();
+if (GLEW_OK != err) {
+ LOG_ERROR("glew failure: " << glewGetErrorString(err));
+ assert(false);
+}
#endif
}
--
GitLab