summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowseglcontext.h
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@digia.com>2014-07-13 00:08:01 +0300
committerFriedemann Kleint <Friedemann.Kleint@digia.com>2014-07-15 13:23:58 +0200
commit4aec47b1ebd25ead5775767f3e8d6b2e29fd8630 (patch)
treef5ae01113aa8ae991f4e41030efff944faf0c0b4 /src/plugins/platforms/windows/qwindowseglcontext.h
parent87aceebf42af5bbc7ea96ac1a60a7ba030ad3e3f (diff)
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 <kai.koehne@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowseglcontext.h')
-rw-r--r--src/plugins/platforms/windows/qwindowseglcontext.h8
1 files changed, 8 insertions, 0 deletions
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