diff options
| -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 |