diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt index 3abacc8527..9f36009cb0 100644 --- a/libkwineffects/CMakeLists.txt +++ b/libkwineffects/CMakeLists.txt @@ -51,6 +51,7 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude ) include_directories(${OPENGLES_EGL_INCLUDE_DIR}) endif() add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS}) + generate_export_header(kwinglutils EXPORT_FILE_NAME kwinglutils_export.h) target_link_libraries(${name} PUBLIC Qt5::DBus Qt5::X11Extras ${XCB_XCB_LIBRARY}) if(OPENGL_EGL_FOUND) target_link_libraries(${name} PRIVATE ${OPENGLES_EGL_LIBRARY}) @@ -93,6 +94,7 @@ install( FILES kwinxrenderutils.h ${CMAKE_CURRENT_BINARY_DIR}/kwinconfig.h ${CMAKE_CURRENT_BINARY_DIR}/kwineffects_export.h + ${CMAKE_CURRENT_BINARY_DIR}/kwinglutils_export.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) add_subdirectory(autotests) diff --git a/libkwineffects/kwinglcolorcorrection.h b/libkwineffects/kwinglcolorcorrection.h index 9888834d50..90c97a9206 100644 --- a/libkwineffects/kwinglcolorcorrection.h +++ b/libkwineffects/kwinglcolorcorrection.h @@ -21,7 +21,7 @@ along with this program. If not, see . #ifndef KWIN_COLOR_CORRECTION_H #define KWIN_COLOR_CORRECTION_H -#include +#include #include @@ -41,7 +41,7 @@ class ColorCorrectionPrivate; * \warning This class is not designed to be used by effects, however * it may happen to be useful their case somehow. */ -class KWINEFFECTS_EXPORT ColorCorrection : public QObject +class KWINGLUTILS_EXPORT ColorCorrection : public QObject { Q_OBJECT diff --git a/libkwineffects/kwinglplatform.h b/libkwineffects/kwinglplatform.h index 830bf7fb28..a3f3d150ec 100644 --- a/libkwineffects/kwinglplatform.h +++ b/libkwineffects/kwinglplatform.h @@ -21,7 +21,7 @@ along with this program. If not, see . #ifndef KWIN_GLPLATFORM_H #define KWIN_GLPLATFORM_H -#include +#include #include #include @@ -137,7 +137,7 @@ enum ChipClass { }; -class KWINEFFECTS_EXPORT GLPlatform +class KWINGLUTILS_EXPORT GLPlatform { public: ~GLPlatform(); diff --git a/libkwineffects/kwingltexture.h b/libkwineffects/kwingltexture.h index e3d0cecf2d..9ac6b711f8 100644 --- a/libkwineffects/kwingltexture.h +++ b/libkwineffects/kwingltexture.h @@ -22,7 +22,7 @@ along with this program. If not, see . #ifndef KWIN_GLTEXTURE_H #define KWIN_GLTEXTURE_H -#include +#include #include #include @@ -47,7 +47,7 @@ enum TextureCoordinateType { UnnormalizedCoordinates }; -class KWINEFFECTS_EXPORT GLTexture +class KWINGLUTILS_EXPORT GLTexture { public: GLTexture(); diff --git a/libkwineffects/kwingltexture_p.h b/libkwineffects/kwingltexture_p.h index e5e34a9e76..f6684b0a84 100644 --- a/libkwineffects/kwingltexture_p.h +++ b/libkwineffects/kwingltexture_p.h @@ -24,7 +24,7 @@ along with this program. If not, see . #define KWIN_GLTEXTURE_P_H #include "kwinconfig.h" // KWIN_HAVE_OPENGL -#include +#include #include #include @@ -35,7 +35,7 @@ namespace KWin // forward declarations class GLVertexBuffer; -class KWINEFFECTS_EXPORT GLTexturePrivate +class KWINGLUTILS_EXPORT GLTexturePrivate : public QSharedData { public: diff --git a/libkwineffects/kwinglutils.h b/libkwineffects/kwinglutils.h index 6b16cd37c1..a3e91a1965 100644 --- a/libkwineffects/kwinglutils.h +++ b/libkwineffects/kwinglutils.h @@ -23,7 +23,7 @@ along with this program. If not, see . #define KWIN_GLUTILS_H // kwin -#include +#include #include "kwinglutils_funcs.h" #include "kwingltexture.h" @@ -50,30 +50,30 @@ class GLVertexBufferPrivate; // Initializes GLX function pointers -void KWINEFFECTS_EXPORT initGLX(); +void KWINGLUTILS_EXPORT initGLX(); // Initializes OpenGL stuff. This includes resolving function pointers as // well as checking for GL version and extensions // Note that GL context has to be created by the time this function is called -void KWINEFFECTS_EXPORT initGL(OpenGLPlatformInterface platformInterface); +void KWINGLUTILS_EXPORT initGL(OpenGLPlatformInterface platformInterface); // Initializes EGL function pointers -void KWINEFFECTS_EXPORT initEGL(); +void KWINGLUTILS_EXPORT initEGL(); // Cleans up all resources hold by the GL Context -void KWINEFFECTS_EXPORT cleanupGL(); +void KWINGLUTILS_EXPORT cleanupGL(); // Number of supported texture units -extern KWINEFFECTS_EXPORT int glTextureUnitsCount; +extern KWINGLUTILS_EXPORT int glTextureUnitsCount; -bool KWINEFFECTS_EXPORT hasGLVersion(int major, int minor, int release = 0); -bool KWINEFFECTS_EXPORT hasGLXVersion(int major, int minor, int release = 0); -bool KWINEFFECTS_EXPORT hasEGLVersion(int major, int minor, int release = 0); +bool KWINGLUTILS_EXPORT hasGLVersion(int major, int minor, int release = 0); +bool KWINGLUTILS_EXPORT hasGLXVersion(int major, int minor, int release = 0); +bool KWINGLUTILS_EXPORT hasEGLVersion(int major, int minor, int release = 0); // use for both OpenGL and GLX extensions -bool KWINEFFECTS_EXPORT hasGLExtension(const QString& extension); +bool KWINGLUTILS_EXPORT hasGLExtension(const QString& extension); // detect OpenGL error (add to various places in code to pinpoint the place) -bool KWINEFFECTS_EXPORT checkGLError(const char* txt); +bool KWINGLUTILS_EXPORT checkGLError(const char* txt); -inline bool KWINEFFECTS_EXPORT isPowerOfTwo(int x) +inline bool KWINGLUTILS_EXPORT isPowerOfTwo(int x) { return ((x & (x - 1)) == 0); } @@ -81,7 +81,7 @@ inline bool KWINEFFECTS_EXPORT isPowerOfTwo(int x) * @return power of two integer _greater or equal to_ x. * E.g. nearestPowerOfTwo(513) = nearestPowerOfTwo(800) = 1024 **/ -int KWINEFFECTS_EXPORT nearestPowerOfTwo(int x); +int KWINGLUTILS_EXPORT nearestPowerOfTwo(int x); /** * Push a new matrix on the GL matrix stack. @@ -89,7 +89,7 @@ int KWINEFFECTS_EXPORT nearestPowerOfTwo(int x); * as it also handles GLES. * @since 4.7 **/ -KWINEFFECTS_EXPORT void pushMatrix(); +KWINGLUTILS_EXPORT void pushMatrix(); /** * Multiplies current matrix on GL stack with @p matrix and pushes the result on the matrix stack. * This method is the same as pushMatrix followed by multiplyMatrix. @@ -100,7 +100,7 @@ KWINEFFECTS_EXPORT void pushMatrix(); * @see multiplyMatrix * @since 4.7 **/ -KWINEFFECTS_EXPORT void pushMatrix(const QMatrix4x4 &matrix); +KWINGLUTILS_EXPORT void pushMatrix(const QMatrix4x4 &matrix); /** * Multiplies the current matrix on GL stack with @p matrix. * In GLES this method is a noop. This method should be preferred over glMultMatrix @@ -108,7 +108,7 @@ KWINEFFECTS_EXPORT void pushMatrix(const QMatrix4x4 &matrix); * @param matrix The matrix the current matrix on the stack should be multiplied with. * @since 4.7 **/ -KWINEFFECTS_EXPORT void multiplyMatrix(const QMatrix4x4 &matrix); +KWINGLUTILS_EXPORT void multiplyMatrix(const QMatrix4x4 &matrix); /** * Replaces the current matrix on GL stack with @p matrix. * In GLES this method is a no-op. This method should be preferred over glLoadMatrix @@ -116,16 +116,16 @@ KWINEFFECTS_EXPORT void multiplyMatrix(const QMatrix4x4 &matrix); * @param matrix The new matrix to replace the existing one on the GL stack. * @since 4.7 **/ -KWINEFFECTS_EXPORT void loadMatrix(const QMatrix4x4 &matrix); +KWINGLUTILS_EXPORT void loadMatrix(const QMatrix4x4 &matrix); /** * Pops the current matrix from the GL matrix stack. * In GLES this method is a noop. This method should be preferred over glPopMatrix * as it also handles GLES. * @since 4.7 **/ -KWINEFFECTS_EXPORT void popMatrix(); +KWINGLUTILS_EXPORT void popMatrix(); -class KWINEFFECTS_EXPORT GLShader +class KWINGLUTILS_EXPORT GLShader { public: enum Flags { @@ -254,7 +254,7 @@ private: * @author Martin Gräßlin * @since 4.7 **/ -class KWINEFFECTS_EXPORT ShaderManager +class KWINGLUTILS_EXPORT ShaderManager { public: /** @@ -438,7 +438,7 @@ private: * the code to remove checks for OpenGL 1/2. * @since 4.10 **/ -class KWINEFFECTS_EXPORT ShaderBinder +class KWINGLUTILS_EXPORT ShaderBinder { public: /** @@ -516,7 +516,7 @@ GLShader* ShaderBinder::shader() * * @author Rivo Laks **/ -class KWINEFFECTS_EXPORT GLRenderTarget +class KWINGLUTILS_EXPORT GLRenderTarget { public: /** @@ -628,7 +628,7 @@ struct GLVertexAttrib * @author Martin Gräßlin * @since 4.6 */ -class KWINEFFECTS_EXPORT GLVertexBuffer +class KWINGLUTILS_EXPORT GLVertexBuffer { public: /** diff --git a/libkwineffects/kwinglutils_funcs.h b/libkwineffects/kwinglutils_funcs.h index ada9341f9e..87384c95d1 100644 --- a/libkwineffects/kwinglutils_funcs.h +++ b/libkwineffects/kwinglutils_funcs.h @@ -21,14 +21,14 @@ along with this program. If not, see . #ifndef KWIN_GLUTILS_FUNCS_H #define KWIN_GLUTILS_FUNCS_H -#include +#include #include #include // common functionality namespace KWin { -void KWINEFFECTS_EXPORT glResolveFunctions(OpenGLPlatformInterface platformInterface); +void KWINGLUTILS_EXPORT glResolveFunctions(OpenGLPlatformInterface platformInterface); } @@ -81,7 +81,7 @@ void KWINEFFECTS_EXPORT glResolveFunctions(OpenGLPlatformInterface platformInter namespace KWin { -void KWINEFFECTS_EXPORT glxResolveFunctions(); +void KWINGLUTILS_EXPORT glxResolveFunctions(); // Defines @@ -188,42 +188,42 @@ typedef char GLchar; // finding of OpenGL extensions functions typedef void (*glXFuncPtr)(); typedef glXFuncPtr(*glXGetProcAddress_func)(const GLubyte*); -extern KWINEFFECTS_EXPORT glXGetProcAddress_func glXGetProcAddress; +extern KWINGLUTILS_EXPORT glXGetProcAddress_func glXGetProcAddress; // glXQueryDrawable (added in GLX 1.3) typedef void (*glXQueryDrawable_func)(Display* dpy, GLXDrawable drawable, int attribute, unsigned int *value); -extern KWINEFFECTS_EXPORT glXQueryDrawable_func glXQueryDrawable; +extern KWINGLUTILS_EXPORT glXQueryDrawable_func glXQueryDrawable; // texture_from_pixmap extension functions typedef void (*glXBindTexImageEXT_func)(Display* dpy, GLXDrawable drawable, int buffer, const int* attrib_list); typedef void (*glXReleaseTexImageEXT_func)(Display* dpy, GLXDrawable drawable, int buffer); -extern KWINEFFECTS_EXPORT glXReleaseTexImageEXT_func glXReleaseTexImageEXT; -extern KWINEFFECTS_EXPORT glXBindTexImageEXT_func glXBindTexImageEXT; +extern KWINGLUTILS_EXPORT glXReleaseTexImageEXT_func glXReleaseTexImageEXT; +extern KWINGLUTILS_EXPORT glXBindTexImageEXT_func glXBindTexImageEXT; // glXCopySubBufferMESA typedef void (*glXCopySubBuffer_func)(Display* , GLXDrawable, int, int, int, int); -extern KWINEFFECTS_EXPORT glXCopySubBuffer_func glXCopySubBuffer; +extern KWINGLUTILS_EXPORT glXCopySubBuffer_func glXCopySubBuffer; // video_sync extension functions typedef int (*glXGetVideoSync_func)(unsigned int *count); typedef int (*glXWaitVideoSync_func)(int divisor, int remainder, unsigned int *count); typedef int (*glXSwapIntervalMESA_func)(unsigned int interval); typedef void (*glXSwapIntervalEXT_func)(Display *dpy, GLXDrawable drawable, int interval); typedef int (*glXSwapIntervalSGI_func)(int interval); -extern KWINEFFECTS_EXPORT glXGetVideoSync_func glXGetVideoSync; -extern KWINEFFECTS_EXPORT glXWaitVideoSync_func glXWaitVideoSync; -extern KWINEFFECTS_EXPORT glXSwapIntervalMESA_func glXSwapIntervalMESA; -extern KWINEFFECTS_EXPORT glXSwapIntervalEXT_func glXSwapIntervalEXT; -extern KWINEFFECTS_EXPORT glXSwapIntervalSGI_func glXSwapIntervalSGI; +extern KWINGLUTILS_EXPORT glXGetVideoSync_func glXGetVideoSync; +extern KWINGLUTILS_EXPORT glXWaitVideoSync_func glXWaitVideoSync; +extern KWINGLUTILS_EXPORT glXSwapIntervalMESA_func glXSwapIntervalMESA; +extern KWINGLUTILS_EXPORT glXSwapIntervalEXT_func glXSwapIntervalEXT; +extern KWINGLUTILS_EXPORT glXSwapIntervalSGI_func glXSwapIntervalSGI; // GLX_ARB_create_context typedef GLXContext (*glXCreateContextAttribsARB_func)(Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); -extern KWINEFFECTS_EXPORT glXCreateContextAttribsARB_func glXCreateContextAttribsARB; +extern KWINGLUTILS_EXPORT glXCreateContextAttribsARB_func glXCreateContextAttribsARB; // glActiveTexture typedef void (*glActiveTexture_func)(GLenum); -extern KWINEFFECTS_EXPORT glActiveTexture_func glActiveTexture; +extern KWINGLUTILS_EXPORT glActiveTexture_func glActiveTexture; // framebuffer_object extension functions typedef GLboolean(*glIsRenderbuffer_func)(GLuint renderbuffer); typedef void (*glBindRenderbuffer_func)(GLenum target, GLuint renderbuffer); @@ -243,24 +243,24 @@ typedef void (*glFramebufferRenderbuffer_func)(GLenum target, GLenum attachment, typedef void (*glGetFramebufferAttachmentParameteriv_func)(GLenum target, GLenum attachment, GLenum pname, GLint *params); typedef void (*glGenerateMipmap_func)(GLenum target); typedef void (*glBlitFramebuffer_func)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -extern KWINEFFECTS_EXPORT glIsRenderbuffer_func glIsRenderbuffer; -extern KWINEFFECTS_EXPORT glBindRenderbuffer_func glBindRenderbuffer; -extern KWINEFFECTS_EXPORT glDeleteRenderbuffers_func glDeleteRenderbuffers; -extern KWINEFFECTS_EXPORT glGenRenderbuffers_func glGenRenderbuffers; -extern KWINEFFECTS_EXPORT glRenderbufferStorage_func glRenderbufferStorage; -extern KWINEFFECTS_EXPORT glGetRenderbufferParameteriv_func glGetRenderbufferParameteriv; -extern KWINEFFECTS_EXPORT glIsFramebuffer_func glIsFramebuffer; -extern KWINEFFECTS_EXPORT glBindFramebuffer_func glBindFramebuffer; -extern KWINEFFECTS_EXPORT glDeleteFramebuffers_func glDeleteFramebuffers; -extern KWINEFFECTS_EXPORT glGenFramebuffers_func glGenFramebuffers; -extern KWINEFFECTS_EXPORT glCheckFramebufferStatus_func glCheckFramebufferStatus; -extern KWINEFFECTS_EXPORT glFramebufferTexture1D_func glFramebufferTexture1D; -extern KWINEFFECTS_EXPORT glFramebufferTexture2D_func glFramebufferTexture2D; -extern KWINEFFECTS_EXPORT glFramebufferTexture3D_func glFramebufferTexture3D; -extern KWINEFFECTS_EXPORT glFramebufferRenderbuffer_func glFramebufferRenderbuffer; -extern KWINEFFECTS_EXPORT glGetFramebufferAttachmentParameteriv_func glGetFramebufferAttachmentParameteriv; -extern KWINEFFECTS_EXPORT glGenerateMipmap_func glGenerateMipmap; -extern KWINEFFECTS_EXPORT glBlitFramebuffer_func glBlitFramebuffer; +extern KWINGLUTILS_EXPORT glIsRenderbuffer_func glIsRenderbuffer; +extern KWINGLUTILS_EXPORT glBindRenderbuffer_func glBindRenderbuffer; +extern KWINGLUTILS_EXPORT glDeleteRenderbuffers_func glDeleteRenderbuffers; +extern KWINGLUTILS_EXPORT glGenRenderbuffers_func glGenRenderbuffers; +extern KWINGLUTILS_EXPORT glRenderbufferStorage_func glRenderbufferStorage; +extern KWINGLUTILS_EXPORT glGetRenderbufferParameteriv_func glGetRenderbufferParameteriv; +extern KWINGLUTILS_EXPORT glIsFramebuffer_func glIsFramebuffer; +extern KWINGLUTILS_EXPORT glBindFramebuffer_func glBindFramebuffer; +extern KWINGLUTILS_EXPORT glDeleteFramebuffers_func glDeleteFramebuffers; +extern KWINGLUTILS_EXPORT glGenFramebuffers_func glGenFramebuffers; +extern KWINGLUTILS_EXPORT glCheckFramebufferStatus_func glCheckFramebufferStatus; +extern KWINGLUTILS_EXPORT glFramebufferTexture1D_func glFramebufferTexture1D; +extern KWINGLUTILS_EXPORT glFramebufferTexture2D_func glFramebufferTexture2D; +extern KWINGLUTILS_EXPORT glFramebufferTexture3D_func glFramebufferTexture3D; +extern KWINGLUTILS_EXPORT glFramebufferRenderbuffer_func glFramebufferRenderbuffer; +extern KWINGLUTILS_EXPORT glGetFramebufferAttachmentParameteriv_func glGetFramebufferAttachmentParameteriv; +extern KWINGLUTILS_EXPORT glGenerateMipmap_func glGenerateMipmap; +extern KWINGLUTILS_EXPORT glBlitFramebuffer_func glBlitFramebuffer; // Shader stuff typedef GLuint(*glCreateShader_func)(GLenum); typedef GLvoid(*glShaderSource_func)(GLuint, GLsizei, const GLchar**, const GLint*); @@ -298,64 +298,64 @@ typedef void (*glProgramStringARB_func)(GLenum, GLenum, GLsizei, const GLvoid*); typedef void (*glProgramLocalParameter4fARB_func)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); typedef void (*glDeleteProgramsARB_func)(GLsizei, const GLuint*); typedef void (*glGetProgramivARB_func)(GLenum, GLenum, GLint*); -extern KWINEFFECTS_EXPORT glCreateShader_func glCreateShader; -extern KWINEFFECTS_EXPORT glShaderSource_func glShaderSource; -extern KWINEFFECTS_EXPORT glCompileShader_func glCompileShader; -extern KWINEFFECTS_EXPORT glDeleteShader_func glDeleteShader; -extern KWINEFFECTS_EXPORT glCreateProgram_func glCreateProgram; -extern KWINEFFECTS_EXPORT glAttachShader_func glAttachShader; -extern KWINEFFECTS_EXPORT glLinkProgram_func glLinkProgram; -extern KWINEFFECTS_EXPORT glUseProgram_func glUseProgram; -extern KWINEFFECTS_EXPORT glDeleteProgram_func glDeleteProgram; -extern KWINEFFECTS_EXPORT glGetShaderInfoLog_func glGetShaderInfoLog; -extern KWINEFFECTS_EXPORT glGetProgramInfoLog_func glGetProgramInfoLog; -extern KWINEFFECTS_EXPORT glGetProgramiv_func glGetProgramiv; -extern KWINEFFECTS_EXPORT glGetShaderiv_func glGetShaderiv; -extern KWINEFFECTS_EXPORT glUniform1f_func glUniform1f; -extern KWINEFFECTS_EXPORT glUniform2f_func glUniform2f; -extern KWINEFFECTS_EXPORT glUniform3f_func glUniform3f; -extern KWINEFFECTS_EXPORT glUniform4f_func glUniform4f; -extern KWINEFFECTS_EXPORT glUniform1i_func glUniform1i; -extern KWINEFFECTS_EXPORT glUniform1fv_func glUniform1fv; -extern KWINEFFECTS_EXPORT glUniform2fv_func glUniform2fv; -extern KWINEFFECTS_EXPORT glUniform3fv_func glUniform3fv; -extern KWINEFFECTS_EXPORT glUniform4fv_func glUniform4fv; -extern KWINEFFECTS_EXPORT glGetUniformfv_func glGetUniformfv; -extern KWINEFFECTS_EXPORT glUniformMatrix4fv_func glUniformMatrix4fv; -extern KWINEFFECTS_EXPORT glValidateProgram_func glValidateProgram; -extern KWINEFFECTS_EXPORT glGetUniformLocation_func glGetUniformLocation; -extern KWINEFFECTS_EXPORT glVertexAttrib1f_func glVertexAttrib1f; -extern KWINEFFECTS_EXPORT glGetAttribLocation_func glGetAttribLocation; -extern KWINEFFECTS_EXPORT glBindAttribLocation_func glBindAttribLocation; -extern KWINEFFECTS_EXPORT glGenProgramsARB_func glGenProgramsARB; -extern KWINEFFECTS_EXPORT glBindProgramARB_func glBindProgramARB; -extern KWINEFFECTS_EXPORT glProgramStringARB_func glProgramStringARB; -extern KWINEFFECTS_EXPORT glProgramLocalParameter4fARB_func glProgramLocalParameter4fARB; -extern KWINEFFECTS_EXPORT glDeleteProgramsARB_func glDeleteProgramsARB; -extern KWINEFFECTS_EXPORT glGetProgramivARB_func glGetProgramivARB; +extern KWINGLUTILS_EXPORT glCreateShader_func glCreateShader; +extern KWINGLUTILS_EXPORT glShaderSource_func glShaderSource; +extern KWINGLUTILS_EXPORT glCompileShader_func glCompileShader; +extern KWINGLUTILS_EXPORT glDeleteShader_func glDeleteShader; +extern KWINGLUTILS_EXPORT glCreateProgram_func glCreateProgram; +extern KWINGLUTILS_EXPORT glAttachShader_func glAttachShader; +extern KWINGLUTILS_EXPORT glLinkProgram_func glLinkProgram; +extern KWINGLUTILS_EXPORT glUseProgram_func glUseProgram; +extern KWINGLUTILS_EXPORT glDeleteProgram_func glDeleteProgram; +extern KWINGLUTILS_EXPORT glGetShaderInfoLog_func glGetShaderInfoLog; +extern KWINGLUTILS_EXPORT glGetProgramInfoLog_func glGetProgramInfoLog; +extern KWINGLUTILS_EXPORT glGetProgramiv_func glGetProgramiv; +extern KWINGLUTILS_EXPORT glGetShaderiv_func glGetShaderiv; +extern KWINGLUTILS_EXPORT glUniform1f_func glUniform1f; +extern KWINGLUTILS_EXPORT glUniform2f_func glUniform2f; +extern KWINGLUTILS_EXPORT glUniform3f_func glUniform3f; +extern KWINGLUTILS_EXPORT glUniform4f_func glUniform4f; +extern KWINGLUTILS_EXPORT glUniform1i_func glUniform1i; +extern KWINGLUTILS_EXPORT glUniform1fv_func glUniform1fv; +extern KWINGLUTILS_EXPORT glUniform2fv_func glUniform2fv; +extern KWINGLUTILS_EXPORT glUniform3fv_func glUniform3fv; +extern KWINGLUTILS_EXPORT glUniform4fv_func glUniform4fv; +extern KWINGLUTILS_EXPORT glGetUniformfv_func glGetUniformfv; +extern KWINGLUTILS_EXPORT glUniformMatrix4fv_func glUniformMatrix4fv; +extern KWINGLUTILS_EXPORT glValidateProgram_func glValidateProgram; +extern KWINGLUTILS_EXPORT glGetUniformLocation_func glGetUniformLocation; +extern KWINGLUTILS_EXPORT glVertexAttrib1f_func glVertexAttrib1f; +extern KWINGLUTILS_EXPORT glGetAttribLocation_func glGetAttribLocation; +extern KWINGLUTILS_EXPORT glBindAttribLocation_func glBindAttribLocation; +extern KWINGLUTILS_EXPORT glGenProgramsARB_func glGenProgramsARB; +extern KWINGLUTILS_EXPORT glBindProgramARB_func glBindProgramARB; +extern KWINGLUTILS_EXPORT glProgramStringARB_func glProgramStringARB; +extern KWINGLUTILS_EXPORT glProgramLocalParameter4fARB_func glProgramLocalParameter4fARB; +extern KWINGLUTILS_EXPORT glDeleteProgramsARB_func glDeleteProgramsARB; +extern KWINGLUTILS_EXPORT glGetProgramivARB_func glGetProgramivARB; // vertex buffer objects typedef void (*glGenBuffers_func)(GLsizei, GLuint*); -extern KWINEFFECTS_EXPORT glGenBuffers_func glGenBuffers; +extern KWINGLUTILS_EXPORT glGenBuffers_func glGenBuffers; typedef void (*glDeleteBuffers_func)(GLsizei n, const GLuint*); -extern KWINEFFECTS_EXPORT glDeleteBuffers_func glDeleteBuffers; +extern KWINGLUTILS_EXPORT glDeleteBuffers_func glDeleteBuffers; typedef void (*glBindBuffer_func)(GLenum, GLuint); -extern KWINEFFECTS_EXPORT glBindBuffer_func glBindBuffer; +extern KWINGLUTILS_EXPORT glBindBuffer_func glBindBuffer; typedef void (*glBufferData_func)(GLenum, GLsizeiptr, const GLvoid*, GLenum); -extern KWINEFFECTS_EXPORT glBufferData_func glBufferData; +extern KWINGLUTILS_EXPORT glBufferData_func glBufferData; typedef void (*glBufferSubData_func)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -extern KWINEFFECTS_EXPORT glBufferSubData_func glBufferSubData; +extern KWINGLUTILS_EXPORT glBufferSubData_func glBufferSubData; typedef void (*glGetBufferSubData_func)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -extern KWINEFFECTS_EXPORT glGetBufferSubData_func glGetBufferSubData; +extern KWINGLUTILS_EXPORT glGetBufferSubData_func glGetBufferSubData; typedef void (*glEnableVertexAttribArray_func)(GLuint); -extern KWINEFFECTS_EXPORT glEnableVertexAttribArray_func glEnableVertexAttribArray; +extern KWINGLUTILS_EXPORT glEnableVertexAttribArray_func glEnableVertexAttribArray; typedef void (*glDisableVertexAttribArray_func)(GLuint); -extern KWINEFFECTS_EXPORT glDisableVertexAttribArray_func glDisableVertexAttribArray; +extern KWINGLUTILS_EXPORT glDisableVertexAttribArray_func glDisableVertexAttribArray; typedef void (*glVertexAttribPointer_func)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid*); -extern KWINEFFECTS_EXPORT glVertexAttribPointer_func glVertexAttribPointer; +extern KWINGLUTILS_EXPORT glVertexAttribPointer_func glVertexAttribPointer; typedef GLvoid *(*glMapBuffer_func)(GLenum target, GLenum access); -extern KWINEFFECTS_EXPORT glMapBuffer_func glMapBuffer; +extern KWINGLUTILS_EXPORT glMapBuffer_func glMapBuffer; typedef GLboolean (*glUnmapBuffer_func)(GLenum target); -extern KWINEFFECTS_EXPORT glUnmapBuffer_func glUnmapBuffer; +extern KWINGLUTILS_EXPORT glUnmapBuffer_func glUnmapBuffer; // GL_ARB_vertex_array_object typedef void (*glBindVertexArray_func)(GLuint array); @@ -363,10 +363,10 @@ typedef void (*glDeleteVertexArrays_func)(GLsizei n, const GLuint *arrays); typedef void (*glGenVertexArrays_func)(GLsizei n, GLuint *arrays); typedef GLboolean (*glIsVertexArray_func)(GLuint array); -extern KWINEFFECTS_EXPORT glBindVertexArray_func glBindVertexArray; -extern KWINEFFECTS_EXPORT glDeleteVertexArrays_func glDeleteVertexArrays; -extern KWINEFFECTS_EXPORT glGenVertexArrays_func glGenVertexArrays; -extern KWINEFFECTS_EXPORT glIsVertexArray_func glIsVertexArray; +extern KWINGLUTILS_EXPORT glBindVertexArray_func glBindVertexArray; +extern KWINGLUTILS_EXPORT glDeleteVertexArrays_func glDeleteVertexArrays; +extern KWINGLUTILS_EXPORT glGenVertexArrays_func glGenVertexArrays; +extern KWINGLUTILS_EXPORT glIsVertexArray_func glIsVertexArray; // GL_EXT_gpu_shader4 / GL 3.0 typedef void (*glVertexAttribI1i_func)(GLuint index, GLint x_func); @@ -403,68 +403,68 @@ typedef void (*glUniform1uiv_func)(GLint location, GLsizei count, const GLuint * typedef void (*glUniform2uiv_func)(GLint location, GLsizei count, const GLuint *value); typedef void (*glUniform3uiv_func)(GLint location, GLsizei count, const GLuint *value); -extern KWINEFFECTS_EXPORT glVertexAttribI1i_func glVertexAttribI1i; -extern KWINEFFECTS_EXPORT glVertexAttribI2i_func glVertexAttribI2i; -extern KWINEFFECTS_EXPORT glVertexAttribI3i_func glVertexAttribI3i; -extern KWINEFFECTS_EXPORT glVertexAttribI4i_func glVertexAttribI4i; -extern KWINEFFECTS_EXPORT glVertexAttribI1ui_func glVertexAttribI1ui; -extern KWINEFFECTS_EXPORT glVertexAttribI2ui_func glVertexAttribI2ui; -extern KWINEFFECTS_EXPORT glVertexAttribI3ui_func glVertexAttribI3ui; -extern KWINEFFECTS_EXPORT glVertexAttribI4ui_func glVertexAttribI4ui; -extern KWINEFFECTS_EXPORT glVertexAttribI1iv_func glVertexAttribI1iv; -extern KWINEFFECTS_EXPORT glVertexAttribI2iv_func glVertexAttribI2iv; -extern KWINEFFECTS_EXPORT glVertexAttribI3iv_func glVertexAttribI3iv; -extern KWINEFFECTS_EXPORT glVertexAttribI4iv_func glVertexAttribI4iv; -extern KWINEFFECTS_EXPORT glVertexAttribI1uiv_func glVertexAttribI1uiv; -extern KWINEFFECTS_EXPORT glVertexAttribI2uiv_func glVertexAttribI2uiv; -extern KWINEFFECTS_EXPORT glVertexAttribI3uiv_func glVertexAttribI3uiv; -extern KWINEFFECTS_EXPORT glVertexAttribI4uiv_func glVertexAttribI4uiv; -extern KWINEFFECTS_EXPORT glVertexAttribI4bv_func glVertexAttribI4bv; -extern KWINEFFECTS_EXPORT glVertexAttribI4sv_func glVertexAttribI4sv; -extern KWINEFFECTS_EXPORT glVertexAttribI4ubv_func glVertexAttribI4ubv; -extern KWINEFFECTS_EXPORT glVertexAttribI4usv_func glVertexAttribI4usv; -extern KWINEFFECTS_EXPORT glVertexAttribIPointer_func glVertexAttribIPointer; -extern KWINEFFECTS_EXPORT glGetVertexAttribIiv_func glGetVertexAttribIiv; -extern KWINEFFECTS_EXPORT glGetVertexAttribIuiv_func glGetVertexAttribIuiv; -extern KWINEFFECTS_EXPORT glGetUniformuiv_func glGetUniformuiv; -extern KWINEFFECTS_EXPORT glBindFragDataLocation_func glBindFragDataLocation; -extern KWINEFFECTS_EXPORT glGetFragDataLocation_func glGetFragDataLocation; -extern KWINEFFECTS_EXPORT glUniform1ui_func glUniform1ui; -extern KWINEFFECTS_EXPORT glUniform2ui_func glUniform2ui; -extern KWINEFFECTS_EXPORT glUniform3ui_func glUniform3ui; -extern KWINEFFECTS_EXPORT glUniform4ui_func glUniform4ui; -extern KWINEFFECTS_EXPORT glUniform1uiv_func glUniform1uiv; -extern KWINEFFECTS_EXPORT glUniform2uiv_func glUniform2uiv; -extern KWINEFFECTS_EXPORT glUniform3uiv_func glUniform3uiv; +extern KWINGLUTILS_EXPORT glVertexAttribI1i_func glVertexAttribI1i; +extern KWINGLUTILS_EXPORT glVertexAttribI2i_func glVertexAttribI2i; +extern KWINGLUTILS_EXPORT glVertexAttribI3i_func glVertexAttribI3i; +extern KWINGLUTILS_EXPORT glVertexAttribI4i_func glVertexAttribI4i; +extern KWINGLUTILS_EXPORT glVertexAttribI1ui_func glVertexAttribI1ui; +extern KWINGLUTILS_EXPORT glVertexAttribI2ui_func glVertexAttribI2ui; +extern KWINGLUTILS_EXPORT glVertexAttribI3ui_func glVertexAttribI3ui; +extern KWINGLUTILS_EXPORT glVertexAttribI4ui_func glVertexAttribI4ui; +extern KWINGLUTILS_EXPORT glVertexAttribI1iv_func glVertexAttribI1iv; +extern KWINGLUTILS_EXPORT glVertexAttribI2iv_func glVertexAttribI2iv; +extern KWINGLUTILS_EXPORT glVertexAttribI3iv_func glVertexAttribI3iv; +extern KWINGLUTILS_EXPORT glVertexAttribI4iv_func glVertexAttribI4iv; +extern KWINGLUTILS_EXPORT glVertexAttribI1uiv_func glVertexAttribI1uiv; +extern KWINGLUTILS_EXPORT glVertexAttribI2uiv_func glVertexAttribI2uiv; +extern KWINGLUTILS_EXPORT glVertexAttribI3uiv_func glVertexAttribI3uiv; +extern KWINGLUTILS_EXPORT glVertexAttribI4uiv_func glVertexAttribI4uiv; +extern KWINGLUTILS_EXPORT glVertexAttribI4bv_func glVertexAttribI4bv; +extern KWINGLUTILS_EXPORT glVertexAttribI4sv_func glVertexAttribI4sv; +extern KWINGLUTILS_EXPORT glVertexAttribI4ubv_func glVertexAttribI4ubv; +extern KWINGLUTILS_EXPORT glVertexAttribI4usv_func glVertexAttribI4usv; +extern KWINGLUTILS_EXPORT glVertexAttribIPointer_func glVertexAttribIPointer; +extern KWINGLUTILS_EXPORT glGetVertexAttribIiv_func glGetVertexAttribIiv; +extern KWINGLUTILS_EXPORT glGetVertexAttribIuiv_func glGetVertexAttribIuiv; +extern KWINGLUTILS_EXPORT glGetUniformuiv_func glGetUniformuiv; +extern KWINGLUTILS_EXPORT glBindFragDataLocation_func glBindFragDataLocation; +extern KWINGLUTILS_EXPORT glGetFragDataLocation_func glGetFragDataLocation; +extern KWINGLUTILS_EXPORT glUniform1ui_func glUniform1ui; +extern KWINGLUTILS_EXPORT glUniform2ui_func glUniform2ui; +extern KWINGLUTILS_EXPORT glUniform3ui_func glUniform3ui; +extern KWINGLUTILS_EXPORT glUniform4ui_func glUniform4ui; +extern KWINGLUTILS_EXPORT glUniform1uiv_func glUniform1uiv; +extern KWINGLUTILS_EXPORT glUniform2uiv_func glUniform2uiv; +extern KWINGLUTILS_EXPORT glUniform3uiv_func glUniform3uiv; // GL_ARB_map_buffer_range typedef GLvoid* (*glMapBufferRange_func)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); typedef void (*glFlushMappedBufferRange_func)(GLenum target, GLintptr offset, GLsizeiptr length); -extern KWINEFFECTS_EXPORT glMapBufferRange_func glMapBufferRange; -extern KWINEFFECTS_EXPORT glFlushMappedBufferRange_func glFlushMappedBufferRange; +extern KWINGLUTILS_EXPORT glMapBufferRange_func glMapBufferRange; +extern KWINGLUTILS_EXPORT glFlushMappedBufferRange_func glFlushMappedBufferRange; // GL_ARB_robustness typedef GLenum (*glGetGraphicsResetStatus_func)(); typedef void (*glReadnPixels_func)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); typedef void (*glGetnUniformfv_func)(GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -extern KWINEFFECTS_EXPORT glGetGraphicsResetStatus_func glGetGraphicsResetStatus; -extern KWINEFFECTS_EXPORT glReadnPixels_func glReadnPixels; -extern KWINEFFECTS_EXPORT glGetnUniformfv_func glGetnUniformfv; +extern KWINGLUTILS_EXPORT glGetGraphicsResetStatus_func glGetGraphicsResetStatus; +extern KWINGLUTILS_EXPORT glReadnPixels_func glReadnPixels; +extern KWINGLUTILS_EXPORT glGetnUniformfv_func glGetnUniformfv; // GL_ARB_draw_elements_base_vertex typedef void (*glDrawElementsBaseVertex_func)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); typedef void (*glDrawElementsInstancedBaseVertex_func)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex); -extern KWINEFFECTS_EXPORT glDrawElementsBaseVertex_func glDrawElementsBaseVertex; -extern KWINEFFECTS_EXPORT glDrawElementsInstancedBaseVertex_func glDrawElementsInstancedBaseVertex; +extern KWINGLUTILS_EXPORT glDrawElementsBaseVertex_func glDrawElementsBaseVertex; +extern KWINGLUTILS_EXPORT glDrawElementsInstancedBaseVertex_func glDrawElementsInstancedBaseVertex; // GL_ARB_copy_buffer typedef void (*glCopyBufferSubData_func)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -extern KWINEFFECTS_EXPORT glCopyBufferSubData_func glCopyBufferSubData; +extern KWINGLUTILS_EXPORT glCopyBufferSubData_func glCopyBufferSubData; } // namespace @@ -543,20 +543,20 @@ extern KWINEFFECTS_EXPORT glCopyBufferSubData_func glCopyBufferSubData; namespace KWin { -void KWINEFFECTS_EXPORT eglResolveFunctions(); -void KWINEFFECTS_EXPORT glResolveFunctions(OpenGLPlatformInterface platformInterface); +void KWINGLUTILS_EXPORT eglResolveFunctions(); +void KWINGLUTILS_EXPORT glResolveFunctions(OpenGLPlatformInterface platformInterface); // EGL typedef EGLImageKHR(*eglCreateImageKHR_func)(EGLDisplay, EGLContext, EGLenum, EGLClientBuffer, const EGLint*); typedef EGLBoolean(*eglDestroyImageKHR_func)(EGLDisplay, EGLImageKHR); typedef EGLBoolean (*eglPostSubBufferNV_func)(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height); -extern KWINEFFECTS_EXPORT eglCreateImageKHR_func eglCreateImageKHR; -extern KWINEFFECTS_EXPORT eglDestroyImageKHR_func eglDestroyImageKHR; -extern KWINEFFECTS_EXPORT eglPostSubBufferNV_func eglPostSubBufferNV; +extern KWINGLUTILS_EXPORT eglCreateImageKHR_func eglCreateImageKHR; +extern KWINGLUTILS_EXPORT eglDestroyImageKHR_func eglDestroyImageKHR; +extern KWINGLUTILS_EXPORT eglPostSubBufferNV_func eglPostSubBufferNV; // GLES typedef GLvoid(*glEGLImageTargetTexture2DOES_func)(GLenum, GLeglImageOES); -extern KWINEFFECTS_EXPORT glEGLImageTargetTexture2DOES_func glEGLImageTargetTexture2DOES; +extern KWINGLUTILS_EXPORT glEGLImageTargetTexture2DOES_func glEGLImageTargetTexture2DOES; #ifdef KWIN_HAVE_OPENGLES @@ -566,29 +566,29 @@ typedef GLvoid *(*glMapBuffer_func)(GLenum target, GLenum access); typedef GLboolean (*glUnmapBuffer_func)(GLenum target); typedef void (*glGetBufferPointerv_func)(GLenum target, GLenum pname, GLvoid **params); -extern KWINEFFECTS_EXPORT glMapBuffer_func glMapBuffer; -extern KWINEFFECTS_EXPORT glUnmapBuffer_func glUnmapBuffer; -extern KWINEFFECTS_EXPORT glGetBufferPointerv_func glGetBufferPointerv; +extern KWINGLUTILS_EXPORT glMapBuffer_func glMapBuffer; +extern KWINGLUTILS_EXPORT glUnmapBuffer_func glUnmapBuffer; +extern KWINGLUTILS_EXPORT glGetBufferPointerv_func glGetBufferPointerv; // GL_OES_texture_3D typedef GLvoid(*glTexImage3DOES_func)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid*); -extern KWINEFFECTS_EXPORT glTexImage3DOES_func glTexImage3D; +extern KWINGLUTILS_EXPORT glTexImage3DOES_func glTexImage3D; // GL_EXT_map_buffer_range typedef GLvoid *(*glMapBufferRange_func)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); typedef void (*glFlushMappedBufferRange_func)(GLenum target, GLintptr offset, GLsizeiptr length); -extern KWINEFFECTS_EXPORT glMapBufferRange_func glMapBufferRange; -extern KWINEFFECTS_EXPORT glFlushMappedBufferRange_func glFlushMappedBufferRange; +extern KWINGLUTILS_EXPORT glMapBufferRange_func glMapBufferRange; +extern KWINGLUTILS_EXPORT glFlushMappedBufferRange_func glFlushMappedBufferRange; // GL_EXT_robustness typedef GLenum (*glGetGraphicsResetStatus_func)(); typedef void (*glReadnPixels_func)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); typedef void (*glGetnUniformfv_func)(GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -extern KWINEFFECTS_EXPORT glGetGraphicsResetStatus_func glGetGraphicsResetStatus; -extern KWINEFFECTS_EXPORT glReadnPixels_func glReadnPixels; -extern KWINEFFECTS_EXPORT glGetnUniformfv_func glGetnUniformfv; +extern KWINGLUTILS_EXPORT glGetGraphicsResetStatus_func glGetGraphicsResetStatus; +extern KWINGLUTILS_EXPORT glReadnPixels_func glReadnPixels; +extern KWINGLUTILS_EXPORT glGetnUniformfv_func glGetnUniformfv; #endif // KWIN_HAVE_OPENGLES