From 8cdd56da9814390d12ad3dc24782c85dd67c9e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20M=C3=B6ller?= Date: Fri, 5 Dec 2014 10:34:54 +0000 Subject: [PATCH] - add cmake glew-definition check - removed glew-definition on compile time check git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free-Staging@19963 383ad7c9-94d9-4d36-a494-682f7c89f535 --- .../Plugin-Render-OITLinkedList/CMakeLists.txt | 2 +- .../OITLinkedList.cc | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/PluginCollection-Renderers/Plugin-Render-OITLinkedList/CMakeLists.txt b/PluginCollection-Renderers/Plugin-Render-OITLinkedList/CMakeLists.txt index faea732..73380c3 100644 --- a/PluginCollection-Renderers/Plugin-Render-OITLinkedList/CMakeLists.txt +++ b/PluginCollection-Renderers/Plugin-Render-OITLinkedList/CMakeLists.txt @@ -1,2 +1,2 @@ include (plugin) -openflipper_plugin ( INSTALLDATA Shaders ) +openflipper_plugin ( INSTALLDATA Shaders GLEWDEFINITIONS GL_ARB_shader_image_load_store) diff --git a/PluginCollection-Renderers/Plugin-Render-OITLinkedList/OITLinkedList.cc b/PluginCollection-Renderers/Plugin-Render-OITLinkedList/OITLinkedList.cc index 76b56f9..06574cc 100644 --- a/PluginCollection-Renderers/Plugin-Render-OITLinkedList/OITLinkedList.cc +++ b/PluginCollection-Renderers/Plugin-Render-OITLinkedList/OITLinkedList.cc @@ -59,7 +59,7 @@ OIT with per pixel linked list (A-Buffer). Implementation based on AMD presentation at GDC 2010: - "OIT and GI using DX11 linked lists" by Nick Thibieroz & Holger Grün + "OIT and GI using DX11 linked lists" by Nick Thibieroz & Holger Gr�n porting from DX11 to GL: @@ -189,9 +189,6 @@ void OITLinkedList::render(ACG::GLState* _glState, Viewer::ViewerProperties& _pr void OITLinkedList::prepareBuffers(int w, int h) { -// check for glew symbol definition -#ifdef GL_ARB_shader_image_load_store - ACG::Vec2ui screenSize = ACG::Vec2ui(GLuint(w), GLuint(h)); // prepare buffers @@ -216,16 +213,10 @@ void OITLinkedList::prepareBuffers(int w, int h) // wait for buffer allocation glMemoryBarrier(GL_BUFFER_UPDATE_BARRIER_BIT | GL_SHADER_IMAGE_ACCESS_BARRIER_BIT); - -#endif } void OITLinkedList::renderOIT(int w, int h, bool multisampled) { -// check for glew symbol definition -#ifdef GL_ARB_shader_image_load_store - - ACG::Vec2ui screenSize = ACG::Vec2ui(GLuint(w), GLuint(h)); prepareBuffers(w, h); @@ -390,19 +381,12 @@ void OITLinkedList::renderOIT(int w, int h, bool multisampled) // std::cout << "buffer size too small: " << actualFragmentCount << std::endl; } - -#endif } QString OITLinkedList::checkOpenGL() { -// check for glew symbol definition -#ifndef GL_ARB_shader_image_load_store - return QString("Built with outdated glew library! Please update glew and rebuild"); -#endif - // Get version and check if ( !ACG::openGLVersion(4,2) ) return QString("Insufficient OpenGL Version! OpenGL 4.2 or higher required"); -- GitLab