From ba08ff6a141a0ac62435cc8ef3f7369f61f6bb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 6 Oct 2012 13:44:12 +0200 Subject: [PATCH] Fix build error when GLES is not available Note to me: always rebuild with all possible build options if something is changed. Sorry for the inconvenience and thanks to the early report of the issue. BUG: 307866 FIXED-IN: 4.10 --- libkwineffects/kwinglutils_funcs.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libkwineffects/kwinglutils_funcs.h b/libkwineffects/kwinglutils_funcs.h index 675088beca..968fb49b94 100644 --- a/libkwineffects/kwinglutils_funcs.h +++ b/libkwineffects/kwinglutils_funcs.h @@ -27,6 +27,13 @@ along with this program. If not, see . #define KWIN_EXPORT KDE_EXPORT +// common functionality +namespace KWin { + +void KWIN_EXPORT glResolveFunctions(OpenGLPlatformInterface platformInterface); + +} + #ifndef KWIN_HAVE_OPENGLES #include @@ -75,7 +82,6 @@ namespace KWin { void KWIN_EXPORT glxResolveFunctions(); -void KWIN_EXPORT glResolveFunctions(); // Defines @@ -357,7 +363,6 @@ namespace KWin { void KWIN_EXPORT eglResolveFunctions(); -void KWIN_EXPORT glResolveFunctions(OpenGLPlatformInterface platformInterface); // EGL typedef EGLImageKHR(*eglCreateImageKHR_func)(EGLDisplay, EGLContext, EGLenum, EGLClientBuffer, const EGLint*); typedef EGLBoolean(*eglDestroyImageKHR_func)(EGLDisplay, EGLImageKHR);