Finally fixed the dumb nvidia segfault on preload, also re-added GLEW…

… as a dependency, pthreads is now required. Fixes #83, #81.
naelstrof · Jul 19, 2017 · 14b0909 · 14b0909
1 parent badecc2
commit 14b0909
Show file tree

Hide file tree

Showing 14 changed files with 209 additions and 4,926 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,14 +21,13 @@ endif()
 
 include_directories("${PROJECT_BINARY_DIR}")
 
-add_definitions(-DSLOP_VERSION="v6.3.46")
+add_definitions(-DSLOP_VERSION="v6.3.47")
 
 # The names have to be unique unfortunately.
 set(EXECUTABLE_NAME "slop")
 set(LIBRARY_NAME "slopy")
 
 add_library(${LIBRARY_NAME} SHARED  src/mouse.cpp
-                                    src/gl_core_3_0.cpp
                                     src/keyboard.cpp
                                     src/x.cpp
                                     src/slopstates.cpp
@@ -51,26 +50,32 @@ set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 11)
 
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules" )
 
+find_package(GLEW REQUIRED)
 find_package(GLM REQUIRED)
 find_package(X11 REQUIRED)
 find_package(XExt REQUIRED)
 find_package(GLX REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(XRender REQUIRED)
+# Ahhhh, finally this eliminates the segfault on preload.
+find_package(Threads REQUIRED)
 
 include_directories(${X11_INCLUDE_DIR}
+                    ${GLEW_INCLUDE_DIR}
                     ${GLM_INCLUDE_DIR}
                     ${XEXT_INCLUDE_DIR}
                     ${GLX_INCLUDE_DIR}
                     ${XRENDER_INCLUDE_DIR}
                     ${OPENGL_INCLUDE_DIR})
 
 target_link_libraries(${LIBRARY_NAME} ${X11_LIBRARIES}
+				      ${CMAKE_THREAD_LIBS_INIT} 
                                       ${GLM_LIBRARIES}
                                       ${OPENGL_LIBRARIES}
                                       ${GLX_LIBRARY}
                                       ${XRENDER_LIBRARY}
-                                      ${XEXT_LIBRARIES})
+                                      ${XEXT_LIBRARIES}
+                                      ${GLEW_LIBRARIES})
 
 target_link_libraries(${EXECUTABLE_NAME} ${LIBRARY_NAME} )
 

diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ While slop not only looks nicer, it's impossible for it to end up in screenshots
 
 ### Install using CMake (Requires CMake)
 
-*Note: Dependencies should be installed first: libxext, OpenGL, and glm.*
+*Note: Dependencies should be installed first: libxext, glew, and glm.*
 
 ```bash
 git clone https://github.com/naelstrof/slop.git

diff --git a/src/framebuffer.cpp b/src/framebuffer.cpp
@@ -1,17 +1,17 @@
 #include "framebuffer.hpp"
 
 slop::Framebuffer::Framebuffer( int w, int h ) {
-    gl::GenFramebuffers( 1, &fbuffer );
-    gl::BindFramebuffer( gl::FRAMEBUFFER, fbuffer );
-    gl::GenTextures( 1, &image );
-    gl::BindTexture( gl::TEXTURE_2D, image );
-    gl::TexImage2D( gl::TEXTURE_2D, 0, gl::RGBA, w, h, 0, gl::RGBA, gl::UNSIGNED_BYTE, NULL );
-    gl::TexParameteri( gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::NEAREST );
-    gl::TexParameteri( gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::NEAREST );
-    gl::TexParameteri( gl::TEXTURE_2D, gl::TEXTURE_WRAP_S, gl::CLAMP_TO_EDGE );
-    gl::TexParameteri( gl::TEXTURE_2D, gl::TEXTURE_WRAP_T, gl::CLAMP_TO_EDGE );
-    gl::FramebufferTexture2D( gl::FRAMEBUFFER, gl::COLOR_ATTACHMENT0, gl::TEXTURE_2D, image, 0 );
-    gl::BindFramebuffer( gl::FRAMEBUFFER, 0 );
+    glGenFramebuffers( 1, &fbuffer );
+    glBindFramebuffer( GL_FRAMEBUFFER, fbuffer );
+    glGenTextures( 1, &image );
+    glBindTexture( GL_TEXTURE_2D, image );
+    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL );
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
+    glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, image, 0 );
+    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
     // generate our vertex and uv buffers
     std::vector<glm::vec2> verts;
     std::vector<glm::vec2> uvs;
@@ -29,11 +29,11 @@ slop::Framebuffer::Framebuffer( int w, int h ) {
     verts.push_back( glm::vec2(1,-1) );
     uvs.push_back( glm::vec2( 1, 0 ) );
 
-    gl::GenBuffers( 2, buffers );
-    gl::BindBuffer( gl::ARRAY_BUFFER, buffers[0] );
-    gl::BufferData( gl::ARRAY_BUFFER, verts.size() * sizeof( glm::vec2 ), &verts[0], gl::STATIC_DRAW );
-    gl::BindBuffer( gl::ARRAY_BUFFER, buffers[1] );
-    gl::BufferData( gl::ARRAY_BUFFER, uvs.size() * sizeof( glm::vec2 ), &uvs[0], gl::STATIC_DRAW );
+    glGenBuffers( 2, buffers );
+    glBindBuffer( GL_ARRAY_BUFFER, buffers[0] );
+    glBufferData( GL_ARRAY_BUFFER, verts.size() * sizeof( glm::vec2 ), &verts[0], GL_STATIC_DRAW );
+    glBindBuffer( GL_ARRAY_BUFFER, buffers[1] );
+    glBufferData( GL_ARRAY_BUFFER, uvs.size() * sizeof( glm::vec2 ), &uvs[0], GL_STATIC_DRAW );
     vertCount = verts.size();
     generatedDesktopImage = false;
 }
@@ -45,44 +45,44 @@ void slop::Framebuffer::setShader( slop::Shader* shader ) {
         XGrabServer(x11->display);
         XImage* image = XGetImage( x11->display, x11->root, 0, 0, WidthOfScreen( x11->screen ), HeightOfScreen( x11->screen ), 0xffffffff, ZPixmap );
         XUngrabServer(x11->display);
-        gl::Enable(gl::TEXTURE_2D);
-        gl::GenTextures(1, &desktopImage);
-        gl::BindTexture(gl::TEXTURE_2D, desktopImage);
-        gl::TexParameterf(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::NEAREST);
-        gl::TexParameterf(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::NEAREST);
-        //gl::TexEnvf(gl::TEXTURE_ENV, gl::TEXTURE_ENV_MODE, gl::MODULATE);
-        gl::TexImage2D( gl::TEXTURE_2D, 0, gl::RGB, WidthOfScreen( x11->screen ), HeightOfScreen( x11->screen ), 0, gl::BGRA, gl::UNSIGNED_BYTE, (void*)(&(image->data[0])));
+        glEnable(GL_TEXTURE_2D);
+        glGenTextures(1, &desktopImage);
+        glBindTexture(GL_TEXTURE_2D, desktopImage);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+        //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+        glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, WidthOfScreen( x11->screen ), HeightOfScreen( x11->screen ), 0, GL_BGRA, GL_UNSIGNED_BYTE, (void*)(&(image->data[0])));
         XDestroyImage( image );
         generatedDesktopImage = true;
     }
 }
 
 slop::Framebuffer::~Framebuffer() {
-    gl::DeleteTextures(1, &image);
-    gl::DeleteFramebuffers(1,&fbuffer);
-    gl::DeleteBuffers(2,buffers);
+    glDeleteTextures(1, &image);
+    glDeleteFramebuffers(1,&fbuffer);
+    glDeleteBuffers(2,buffers);
 }
 
 void slop::Framebuffer::resize( int w, int h ) {
     // Regenerate the image
-    gl::DeleteTextures(1, &image);
-    gl::BindTexture(gl::TEXTURE_2D, image);
-    gl::TexImage2D( gl::TEXTURE_2D, 0, gl::RGBA, w, h, 0, gl::RGBA, gl::UNSIGNED_BYTE, NULL);
-    gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::LINEAR);
-    gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::LINEAR);
+    glDeleteTextures(1, &image);
+    glBindTexture(GL_TEXTURE_2D, image);
+    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
     // Re-bind it to the framebuffer
-    gl::BindFramebuffer( gl::FRAMEBUFFER, fbuffer );
-    gl::FramebufferTexture2D( gl::FRAMEBUFFER, gl::COLOR_ATTACHMENT0, gl::TEXTURE_2D, image, 0);
-    gl::BindFramebuffer(gl::FRAMEBUFFER, 0);
+    glBindFramebuffer( GL_FRAMEBUFFER, fbuffer );
+    glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, image, 0);
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
 }
 
 void slop::Framebuffer::bind() {
-    gl::BindFramebuffer( gl::FRAMEBUFFER, fbuffer );
+    glBindFramebuffer( GL_FRAMEBUFFER, fbuffer );
 }
 
 void slop::Framebuffer::unbind() {
-    gl::BindFramebuffer( gl::FRAMEBUFFER, 0 );
+    glBindFramebuffer( GL_FRAMEBUFFER, 0 );
 }
 
 void slop::Framebuffer::draw(glm::vec2 mouse, float time, glm::vec4 color){
@@ -102,15 +102,15 @@ void slop::Framebuffer::draw(glm::vec2 mouse, float time, glm::vec4 color){
     if ( shader->hasParameter( "time" ) ) {
         shader->setParameter( "time", time );
     }
-    gl::ActiveTexture(gl::TEXTURE0);
-    gl::BindTexture( gl::TEXTURE_2D, image );
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture( GL_TEXTURE_2D, image );
     if ( shader->hasParameter( "desktop" ) ) {
 		shader->setParameter( "desktop", 1 );
-        gl::ActiveTexture(gl::TEXTURE0 + 1);
-        gl::BindTexture( gl::TEXTURE_2D, desktopImage );
+        glActiveTexture(GL_TEXTURE0 + 1);
+        glBindTexture( GL_TEXTURE_2D, desktopImage );
     }
-    gl::Enable( gl::TEXTURE_2D );
-    gl::DrawArrays( gl::TRIANGLES, 0, vertCount );
-    gl::Disable( gl::TEXTURE_2D );
+    glEnable( GL_TEXTURE_2D );
+    glDrawArrays( GL_TRIANGLES, 0, vertCount );
+    glDisable( GL_TEXTURE_2D );
     shader->unbind();
 }
diff --git a/src/framebuffer.hpp b/src/framebuffer.hpp
@@ -21,10 +21,10 @@
 #ifndef N_FRAMEBUFFER_H_
 #define N_FRAMEBUFFER_H_
 
-#include "gl_core_3_0.hpp"
-#include <glm/glm.hpp>
+#include <GL/glew.h>
 #include <GL/gl.h>
 #include <vector>
+#include <glm/glm.hpp>
 
 #include "shader.hpp"