projects/aports·blob master · refs

73 lines · 2.8 KiB

1diff --git a/plugins/opengl/CMakeLists.txt b/plugins/opengl/CMakeLists.txt
2index 63db12b..2fc6046 100644
3--- a/plugins/opengl/CMakeLists.txt
4+++ b/plugins/opengl/CMakeLists.txt
5@@ -21,7 +21,7 @@ include_directories (src/glxtfpbind/include)
6 else (USE_GLES)
7 find_package (OpenGL)
8 if (OPENGL_FOUND)
9- compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGL_INCLUDE_DIR})
10+ compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_LIBRARIES} ${INTERNAL_LIBRARIES} dl INCDIRS ${OPENGL_INCLUDE_DIR})
11 endif (OPENGL_FOUND)
12 endif (USE_GLES)
13
14diff --git a/cmake/plugin_extensions/CompizOpenGLFixups.cmake b/cmake/plugin_extensions/CompizOpenGLFixups.cmake
15index 8691371..f230ceb 100644
16--- a/cmake/plugin_extensions/CompizOpenGLFixups.cmake
17+++ b/cmake/plugin_extensions/CompizOpenGLFixups.cmake
18@@ -4,7 +4,7 @@ if (${COMPIZ_CURRENT_PLUGIN} STREQUAL "opengl")
19 if (USE_GLES)
20 set (PKGCONFIG_LIBS "${OPENGL_egl_LIBRARY} -lGLESv2")
21 else (USE_GLES)
22- set (PKGCONFIG_LIBS "${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY}")
23+ set (PKGCONFIG_LIBS "${OPENGL_LIBRARIES}")
24 endif (USE_GLES)
25 endif (${COMPIZ_CURRENT_PLUGIN} STREQUAL "opengl")
26
27diff --git a/plugins/opengl/compiz-opengl.pc.in b/plugins/opengl/compiz-opengl.pc.in
28index d8b0b79..12c55c7 100644
29--- a/plugins/opengl/compiz-opengl.pc.in
30+++ b/plugins/opengl/compiz-opengl.pc.in
31@@ -8,5 +8,5 @@ Description: Opengl compositing plugin for compiz
32 Version: @VERSION@
33
34 Requires: compiz compiz-composite
35-Libs: @PKGCONFIG_LIBS@ -L${libdir} -lopengl
36+Libs: -lGL -L${libdir} -lopengl
37 Cflags: @COMPIZ_CFLAGS@ -I${includedir}/compiz
38\ No newline at end of file
39diff --git a/plugins/opengl/src/screen.cpp b/plugins/opengl/src/screen.cpp
40index fcf19ca..39bf966 100644
41--- a/plugins/opengl/src/screen.cpp
42+++ b/plugins/opengl/src/screen.cpp
43@@ -40,6 +40,7 @@
44
45 #include <dlfcn.h>
46 #include <math.h>
47+#include <GL/glx.h>
48
49 using namespace boost::placeholders;
50
51@@ -1354,8 +1355,7 @@ GLScreen::GLScreen (CompScreen *s) :
52 GL::bufferAge = true;
53 }
54
55- priv->getProcAddress = (GL::GLXGetProcAddressProc)
56- getProcAddress ("glXGetProcAddressARB");
57+ priv->getProcAddress = &glXGetProcAddressARB;
58 GL::bindTexImage = (GL::GLXBindTexImageProc)
59 getProcAddress ("glXBindTexImageEXT");
60 GL::releaseTexImage = (GL::GLXReleaseTexImageProc)
61diff --git a/plugins/opengl/src/vertexbuffer.cpp b/plugins/opengl/src/vertexbuffer.cpp
62index b102016..4e314c2 100644
63--- a/plugins/opengl/src/vertexbuffer.cpp
64+++ b/plugins/opengl/src/vertexbuffer.cpp
65@@ -164,7 +164,7 @@ void GLVertexBuffer::addVertices (GLuint nVertices, const GLfloat *vertices)
66
67 GLfloat *GLVertexBuffer::getVertices() const
68 {
69- return &priv->vertexData[0];
70+ return priv->vertexData.data();
71 }
72
73 int GLVertexBuffer::getVertexStride() const