From 4aec47b1ebd25ead5775767f3e8d6b2e29fd8630 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Sun, 13 Jul 2014 00:08:01 +0300 Subject: windows: Fix ANGLE function resolution in static builds The EGL/GLES functions are now resolved statically when needed. Task-number: QTBUG-40199 Change-Id: I58c675b1c410708237475e1e5d6609ca7d6713f1 Reviewed-by: Kai Koehne Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowseglcontext.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/plugins/platforms/windows/qwindowseglcontext.h') diff --git a/src/plugins/platforms/windows/qwindowseglcontext.h b/src/plugins/platforms/windows/qwindowseglcontext.h index 813c605396..6c4ac08da1 100644 --- a/src/plugins/platforms/windows/qwindowseglcontext.h +++ b/src/plugins/platforms/windows/qwindowseglcontext.h @@ -81,14 +81,20 @@ struct QWindowsLibEGL __eglMustCastToProperFunctionPointerType (EGLAPIENTRY * eglGetProcAddress)(const char *procname); private: +#ifndef QT_STATIC void *resolve(const char *name); HMODULE m_lib; +#endif }; struct QWindowsLibGLESv2 { bool init(); +#ifndef QT_STATIC void *moduleHandle() const { return m_lib; } +#else + void *moduleHandle() const { return Q_NULLPTR; } +#endif // GL1+GLES2 common void (APIENTRY * glBindTexture)(GLenum target, GLuint texture); @@ -239,8 +245,10 @@ struct QWindowsLibGLESv2 void (APIENTRY * glDepthRangef)(GLclampf nearVal, GLclampf farVal); private: +#ifndef QT_STATIC void *resolve(const char *name); HMODULE m_lib; +#endif }; class QWindowsEGLStaticContext : public QWindowsStaticOpenGLContext -- cgit v1.2.3