diff options
| author | ninerider <qt-info@nokia.com> | 2010-02-27 11:13:01 (GMT) |
|---|---|---|
| committer | ninerider <qt-info@nokia.com> | 2010-02-27 11:13:01 (GMT) |
| commit | 6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29 (patch) | |
| tree | 6a232be656ad332c74a0a352b2552bcef5610a7b | |
| parent | 30abadd0d0a190889dab6d1c154053a25e060042 (diff) | |
| download | Qt-6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29.zip Qt-6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29.tar.gz Qt-6a7b7947e36a2d9440c4eba40dc6d4177fbc0c29.tar.bz2 | |
Preparation to enable OpenGLES 2.0 for Windows Mobile.
As there are no SDKs available for our test device (HTC HD2) that support
OpenGL, we had to construct the libraries by extracting them from the ROM image.
This is still work in progress at this time.
| -rw-r--r-- | src/gui/egl/qegl_wince.cpp | 6 | ||||
| -rw-r--r-- | src/gui/egl/qeglproperties_p.h | 9 | ||||
| -rw-r--r-- | src/opengl/qgl_p.h | 12 |
3 files changed, 20 insertions, 7 deletions
diff --git a/src/gui/egl/qegl_wince.cpp b/src/gui/egl/qegl_wince.cpp index c9c9773..dfef39f 100644 --- a/src/gui/egl/qegl_wince.cpp +++ b/src/gui/egl/qegl_wince.cpp @@ -89,8 +89,10 @@ EGLSurface QEglContext::createSurface(QPaintDevice *device, const QEglProperties EGLNativeDisplayType QEglContext::nativeDisplay() { - HWND win = (static_cast<QWidget*>(device))->winId(); - HDC myDc = GetDC(win); + //HWND win = (static_cast<QWidget*>(device))->winId(); + //HDC myDc = GetDC(win); + HDC myDc = GetWindowDC(0); + if (!myDc) { qWarning("QEglContext::nativeDisplay(): WinCE display is not open"); return EGL_DEFAULT_DISPLAY; diff --git a/src/gui/egl/qeglproperties_p.h b/src/gui/egl/qeglproperties_p.h index feed1d2..43c3393 100644 --- a/src/gui/egl/qeglproperties_p.h +++ b/src/gui/egl/qeglproperties_p.h @@ -58,12 +58,17 @@ QT_BEGIN_INCLUDE_NAMESPACE +#if defined(QT_OPENGL_ES_2) +# include <GLES2/gl2.h> +#endif + #if defined(QT_GLES_EGL) -#include <GLES/egl.h> +# include <GLES/egl.h> #else -#include <EGL/egl.h> +# include <EGL/egl.h> #endif + #if defined(Q_WS_X11) // If <EGL/egl.h> included <X11/Xlib.h>, then the global namespace // may have been polluted with X #define's. The following makes sure diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 0d5a54a..80217c0 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -80,13 +80,19 @@ #define q_vertexTypeEnum GL_FIXED #endif //QT_OPENGL_ES_1_CL -#ifdef QT_OPENGL_ES +#if defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2) QT_BEGIN_INCLUDE_NAMESPACE + #if defined(QT_OPENGL_ES_2) -#include <EGL/egl.h> +# include <GLES2/gl2.h> +#endif + +#if defined(QT_GLES_EGL) +# include <GLES/egl.h> #else -#include <GLES/egl.h> +# include <EGL/egl.h> #endif + QT_END_INCLUDE_NAMESPACE #endif |