Revert "Merge branch 'featureQt5.6Support' into 'master'"

This reverts merge request !92

ACG/CMakeLists.txt

@@ -27,17 +27,12 @@ endif ()
 
 acg_openmp ()
 
-# check for OpenGL, GLEW and GLUT as our required dependencies
+# check for OpenGL and GLUT as our required dependencies
 find_package (OpenGL)
 if (NOT OPENGL_FOUND)
   message (FATAL_ERROR "OpengGL not found!")
 endif ()
 
-find_package (GLEW)
-if (NOT GLEW_FOUND)
-  message (FATAL_ERROR "GLEW not found!")
-endif ()
-
 find_package (GLUT)
 if (NOT GLUT_FOUND)
   message (FATAL_ERROR "GLUT not found!")
@@ -53,7 +48,6 @@ set(INCLUDE_DIRS ${OPENMESH_INCLUDE_DIRS}
                  ${CMAKE_CURRENT_SOURCE_DIR}/ShaderUtils
                  ${CMAKE_CURRENT_BINARY_DIR}
                  ${OPENGL_INCLUDE_DIR}
-                 ${GLEW_INCLUDE_DIR}
                  ${GLUT_INCLUDE_DIR} )
 
 set(ADDITIONAL_LINK_LIBRARIES "" )
@@ -90,7 +84,6 @@ include_directories (
 )
 
 link_directories (
-  ${GLEW_LIBRARY_DIR}
   ${GLUT_LIBRARY_DIR}
 )
 
@@ -159,7 +152,6 @@ acg_print_configure_header (ACG "ACG")
 target_link_libraries ( ACG  ${OPENMESH_LIBRARIES}
                              ${QT_LIBRARIES}
                              ${OPENGL_LIBRARIES}
-                             ${GLEW_LIBRARY}
                              ${GLUT_LIBRARIES}
                              ${ADDITIONAL_LINK_LIBRARIES} )
 

ACG/GL/AntiAliasing.cc

@@ -126,10 +126,13 @@ MSFilterWeights::MSFilterWeights(int _numSamples) : numSamples_(_numSamples) {
 
 //=============================================================================
 
+#if defined(GL_ARB_texture_buffer_object)
+    
 void MSFilterWeights::asTextureBuffer( TextureBuffer& out ) {
   if (numSamples_)
     out.setBufferData(numSamples_ * 4, &weights_[0], GL_R32F, GL_STATIC_DRAW);
 }
+#endif
 
 //=============================================================================
 

ACG/GL/FBO.cc

@@ -125,7 +125,6 @@ void FBO::del()
 
 void FBO::attachTexture( GLenum _attachment, GLuint _texture, GLuint _level )
 {
-#ifdef GL_VERSION_3_2
   // bind fbo
   bind();
 
@@ -155,9 +154,6 @@ void FBO::attachTexture( GLenum _attachment, GLuint _texture, GLuint _level )
 
   // track texture id
   attachments_[_attachment] = intID;
-#else
-  std::cerr << "error: FBO::attachTexture unsupported - update glew headers and rebuild" << std::endl;
-#endif
 }
 
 //-----------------------------------------------------------------------------

ACG/GL/GLFormatInfo.cc

@@ -47,6 +47,7 @@
  *                                                                            *
  \*===========================================================================*/
 
+#include <ACG/GL/acg_glew.hh>
 #include <ACG/GL/GLFormatInfo.hh>
 #include <iostream>
 #include <QString>
@@ -81,7 +82,6 @@ GLFormatInfo::GLFormatInfo( GLenum _internalFormat )
     registerFmt(GL_DEPTH_STENCIL, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 24, 8, 0, 0, UnsignedInt, false);
     registerFmt(GL_DEPTH24_STENCIL8, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 24, 8, 0, 0, UnsignedInt, false);
 
-#ifdef GL_VERSION_3_0
     // single channel formats
     registerFmt(GL_R8, GL_RED, GL_UNSIGNED_BYTE, 8, 0, 0, 0, UnsignedInt, true);
     registerFmt(GL_R8_SNORM, GL_RED, GL_BYTE, 8, 0, 0, 0, SignedInt, true);
@@ -130,19 +130,18 @@ GLFormatInfo::GLFormatInfo( GLenum _internalFormat )
     registerFmt(GL_RGBA32I, GL_RGBA_INTEGER, GL_INT, 32, 32, 32, 32, SignedInt, false);
     registerFmt(GL_RGBA32UI, GL_RGBA_INTEGER, GL_UNSIGNED_INT, 32, 32, 32, 32, UnsignedInt, false);
     registerFmt(GL_RGBA32F, GL_RGBA, GL_FLOAT, 32, 32, 32, 32, FloatingPt, false);
-#endif // GL_VERSION_3_0
 
     // depth
     registerFmt(GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 24, 0, 0, 0, UnsignedInt, false);
     registerFmt(GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 16, 0, 0, 0, UnsignedInt, false);
-#ifdef GL_ARB_depth_buffer_float
+#ifdef GL_DEPTH_COMPONENT32F
     registerFmt(GL_DEPTH_COMPONENT32F, GL_DEPTH_COMPONENT, GL_FLOAT, 32, 0, 0, 0, FloatingPt, false);
     registerFmt(GL_DEPTH32F_STENCIL8, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, 32, 8, -24, 0, FloatingPt, false);
-#endif // GL_ARB_depth_buffer_float
+#endif
 
-#ifdef GL_ARB_texture_stencil8
+#ifdef GL_STENCIL_INDEX8
     registerFmt(GL_STENCIL_INDEX8, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, 8, 0, 0, 0,  UnsignedInt, false);
-#endif // GL_ARB_texture_stencil8
+#endif
   }
 
   std::map<GLenum, GLFormatInfo>::iterator f = formatMap_.find(_internalFormat);

ACG/GL/GLState.cc

@@ -1327,7 +1327,7 @@ void GLState::syncFromGL()
   
   GLint getparam;
 
-#ifdef GL_VERSION_1_4
+#ifdef GL_BLEND_SRC_RGB
   glGetIntegerv(GL_BLEND_SRC_RGB, &getparam);
   stateStack_.back().blendFuncState_[0] = getparam;
 
@@ -1611,7 +1611,7 @@ void GLState::blendFuncSeparate(GLenum _srcRGB, GLenum _dstRGB, GLenum _srcAlpha
       stateStack_.back().blendFuncState_[2] != _srcAlpha || stateStack_.back().blendFuncState_[3] != _dstAlpha)
 #endif
     {
-#ifdef GL_VERSION_1_4
+#ifdef GL_BLEND_SRC_RGB
       // check if glew has loaded glBlendFuncSeparate already
       if (glBlendFuncSeparate)
         glBlendFuncSeparate(_srcRGB, _dstRGB, _srcAlpha, _dstAlpha);

ACG/GL/IRenderer.cc

@@ -316,7 +316,7 @@ void IRenderer::addRenderObject(ACG::RenderObject* _renderObject)
     p->internalFlags_ = 0;
 
     // precompile shader
-#ifdef GL_VERSION_3_2
+#ifdef GL_GEOMETRY_INPUT_TYPE
     GLSL::Program* shaderProg = ACG::ShaderCache::getInstance()->getProgram(&p->shaderDesc);
 #endif
 
@@ -324,7 +324,7 @@ void IRenderer::addRenderObject(ACG::RenderObject* _renderObject)
     // check primitive type and geometry shader
     if (errorDetectionLevel_ > 1 && p->shaderDesc.geometryTemplateFile.length())
     {
-#ifdef GL_VERSION_3_2
+#ifdef GL_GEOMETRY_INPUT_TYPE
       GLint geomInputType = 0;
       glGetProgramiv(shaderProg->getProgramId(), GL_GEOMETRY_INPUT_TYPE, &geomInputType);
 

ACG/GL/ScreenQuad.cc

@@ -188,14 +188,7 @@ void ScreenQuad::intDraw (GLSL::Program* _prog, int _numInstances)
   if (_numInstances < 1)
     glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
   else
-  {
-#ifdef GL_VERSION_3_1
     glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, _numInstances);
-#else
-    std::cerr << "error: instanced ScreenQuad draw - outdated glew version" << std::endl;
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-#endif
-  }
 
   if (_prog)
     decl_->deactivateShaderPipeline(_prog);

ACG/GL/acg_glew.hh

@@ -62,20 +62,13 @@
 #include <cstdlib>
 #include <sstream>
 
+#ifndef __APPLE__
+    #include "gl_compat_4_4.hh"
+#else
+    #include <qgl>
+#endif
 
-#if defined(ARCH_DARWIN)
-
-  #include <gl/glew.h>
-
-#elif defined(WIN32)
-
-  #include <gl/glew.h>
-
-#else // Unix
-
-    #include <GL/glew.h>
 
-#endif
 
 
 //=============================================================================

ACG/GL/gl.hh

@@ -69,11 +69,8 @@
 
 #elif defined(WIN32)
 
+  #include "acg_glew.hh"
   #include <windows.h>
-  // Dont do this anymore! Use dll version. No problems with plugins and dll
-  // but a lot with static linking
-  // #  define GLEW_STATIC 1
-  #include <gl/glew.h>
   #include <gl/glut.h>
 
 #else

ACG/GL/globjects.cc

@@ -47,6 +47,7 @@
  *                                                                            *
  \*===========================================================================*/
 
+
 #include <ACG/GL/acg_glew.hh>
 #include <ACG/GL/globjects.hh>
 #include <ACG/GL/GLFormatInfo.hh>

ACG/QtWidgets/QtBaseViewer.cc

@@ -1128,7 +1128,8 @@ void QtBaseViewer::initializeGL()
   // we use GLEW to manage extensions
   // initialize it first
   #ifndef __APPLE__
-  glewInit();
+  //glewInit();
+  ogl_LoadFunctions();
   #endif
 
 
@@ -1242,7 +1243,8 @@ void QtBaseViewer::paintGL()
     // we use GLEW to manage extensions
     // initialize it first
     #ifndef __APPLE__
-    glewInit();
+    //glewInit();
+    ogl_LoadFunctions();
     #endif
 
     // lock update

CMakeLists.txt

@@ -131,17 +131,12 @@ endif()
 
 acg_openmp ()
 
-# check for OpenGL, GLEW and GLUT as our required dependencies
+# check for OpenGL and GLUT as our required dependencies
 find_package (OpenGL)
 if (NOT OPENGL_FOUND)
   message (FATAL_ERROR "OpengGL not found!")
 endif ()
 
-find_package (GLEW)
-if (NOT GLEW_FOUND)
-  message (FATAL_ERROR "GLEW not found!")
-endif ()
-
 find_package (GLUT)
 if (NOT GLUT_FOUND)
   message (FATAL_ERROR "GLUT not found!")

OpenFlipper/Core/Core.cc

@@ -2035,7 +2035,7 @@ void Core::showReducedMenuBar(bool reduced) {
 }
 
 void Core::finishSplash() {
-    splash_->finish(coreWidget_);
+    splash_->finish(coreWidget_);	
 }
 
 

OpenFlipper/CoreApp/CMakeLists.txt

@@ -7,7 +7,6 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${OPENGL_INCLUDE_DIR}
-  ${GLEW_INCLUDE_DIR}
   ${GLUT_INCLUDE_DIR}
 )
 
@@ -29,14 +28,8 @@ if( APPLE )
   endforeach ()
 
   link_directories (
-    ${GLEW_LIBRARY_DIR}
     ${ADDITIONAL_PLUGINLIB_LINK_DIRS}
   )
-
-else (APPLE)
-   link_directories (
-      ${GLEW_LIBRARY_DIR}
-   )
 endif(APPLE)
 
 if (WIN32)
@@ -229,7 +222,6 @@ target_link_libraries (${OPENFLIPPER_PRODUCT_STRING}
   OpenFlipperPluginLib
   ${QT_LIBRARIES}
   ${OPENGL_LIBRARIES}
-  ${GLEW_LIBRARY}
   ${GLUT_LIBRARIES}
   ${COREAPP_ADDITIONAL_LINK_LIBRARIES}
   ${OPENFLIPPER_STATIC_PLUGINS}

OpenFlipper/Documentation/DeveloperHelpSources/building.docu

@@ -11,7 +11,6 @@ OpenFlipper.
 <ul>
 <li> 5.5 >= Qt >= 4.8.6  ( http://www.qt.io/download/ ) Use the OpenGL version for Qt >= 5.0</li>
 <li> GLUT         ( http://www.opengl.org/resources/libraries/glut/ )</li>
-<li> GLEW (>=1.6) ( http://glew.sourceforge.net )</li>
 </ul>
 
 \section optlibs Optional libraries ( Without these libraries some functionality might not be available) 

OpenFlipper/OpenFlipper.cc

@@ -446,13 +446,9 @@ int main(int argc, char **argv)
         }
       }
      }
-    
-    // After setting all Options from command line, build the real gui
-    w->init();
 
-    #ifndef __APPLE__
-    initGlew();
-    #endif
+    // After setting all Options from command line, build the real gui
+    w->init();   
  
     for ( int i = 0 ; i < args.FileCount(); ++i )
       w->commandLineOpen(args.File(i), openPolyMeshes);    

OpenFlipper/PluginLib/CMakeLists.txt

@@ -42,14 +42,12 @@ include_directories (
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${OPENGL_INCLUDE_DIR}
-  ${GLEW_INCLUDE_DIR}
   ${GLUT_INCLUDE_DIR}
   ${ADDITIONAL_PLUGINLIB_INCS}
   ${PACKAGE_INCLUDES}
 )
 
 link_directories (
-  ${GLEW_LIBRARY_DIR}
   ${ADDITIONAL_PLUGINLIB_LINK_DIRS}
 )
 
@@ -176,7 +174,6 @@ target_link_libraries (OpenFlipperPluginLib
   ACG
   ${QT_LIBRARIES}
   ${OPENGL_LIBRARIES}
-  ${GLEW_LIBRARY}
   ${GLUT_LIBRARIES}
   ${FTGL_LIBS}
   ${ADDITIONAL_PLUGINLIB_LIBS}

OpenFlipper/cmake/plugin.cmake

@@ -16,7 +16,6 @@
 #                      [TRANSLATION_ADDFILES file1 file2 ...]
 #                      [LICENSEMANAGER])
 #
-
 # DIRS                   = additional directories with source files
 # DEPS                   = required dependencies for find_package macro
 # OPTDEPS                = optional dependencies for find_package macro, if found, a define ENABLE_<Depname> will be added automatically
@@ -29,7 +28,6 @@
 # INCDIRS                = additional include directories
 # ADDSRC                 = additional source files
 # INSTALLDATA            = directories that will be installed into the openflipper data directory
-# GLEWDEFINITIONS = Checks glew if it defines the given definitions
 #
 # TRANSLATION_LANGUAGES = language codes for translation
 # TRANSLATION_ADDFILES  = additional files that should be included into the translation files
@@ -72,7 +70,7 @@ endmacro ()
 macro (_get_plugin_parameters _prefix)
     set (_current_var _foo)
     set (_supported_var DIRS DEPS OPTDEPS LDFLAGSADD CFLAGSADD CDEFINITIONSADD
-      LIBRARIES ADD_CORE_APP_LIBRARIES LIBDIRS INCDIRS ADDSRC INSTALLDATA GLEWDEFINITIONS TRANSLATION_LANGUAGES TRANSLATION_ADDFILES)
+      LIBRARIES ADD_CORE_APP_LIBRARIES LIBDIRS INCDIRS ADDSRC INSTALLDATA TRANSLATION_LANGUAGES TRANSLATION_ADDFILES)
     set (_supported_flags LICENSEMANAGER)
     foreach (_val ${_supported_var})
         set (${_prefix}_${_val})
@@ -376,26 +374,6 @@ macro (_plugin_licensemanagement)
   endif()
 endmacro ()
 
-#======================================================
-# check dependencies in GLEW library
-# _prefix    : prefix used ( usually the plugin name )
-#======================================================
-macro (_check_plugin_glew_deps _prefix )
-
- foreach (_extension ${${_prefix}_GLEWDEFINITIONS})
-
-   acg_test_glew_definition( ${_extension} ${_prefix}_GLEW_HAS_DEFINITION_${_extension}  )
-
-   # If the dependency is not found, we disable the plugin
-   if(NOT ${_prefix}_GLEW_HAS_DEFINITION_${_extension} )
-      set (${_prefix}_HAS_DEPS FALSE)
-      acg_set (_${_prefix}_MISSING_DEPS "${_${_prefix}_MISSING_DEPS} GLEW extension ${_extension}")
-   endif()
-
- endforeach()
-
-endmacro ()
-
 
 
 #======================================================
@@ -438,10 +416,6 @@ function (_build_openflipper_plugin plugin)
   endforeach ()
   set_property( GLOBAL PROPERTY GLOBAL_CORE_APP_LIBRARIES ${global_core_app_libraries} )
 
-  # CHECK for GLEW definitions
-  #============================================================================================
-
-  _check_plugin_glew_deps (${_PLUGIN})
 
   #============================================================================================
   # Remember Lib dirs for bundle generation
@@ -486,7 +460,6 @@ function (_build_openflipper_plugin plugin)
       ${${_PLUGIN}_DEPS_INCDIRS}
       ${${_PLUGIN}_INCDIRS}
       ${OPENGL_INCLUDE_DIR}
-      ${GLEW_INCLUDE_DIR}
       ${GLUT_INCLUDE_DIR}
       ${CMAKE_BINARY_DIR}/OpenFlipper/PluginLib
       ${PACKAGE_INCLUDES}