diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-10 14:16:17 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-03-10 14:16:17 (GMT) |
| commit | 727ec8c564a3947784bfe371b39615f965d530ec (patch) | |
| tree | d4360972a21f8d24214b7a0c5ec7277391479192 /src/gui/egl/qegl_p.h | |
| parent | ef9e7168a8ed3e8149204cf6c604a38db35245c0 (diff) | |
| parent | 01a045084ad45da37e6b79938354c82419c0a83e (diff) | |
| download | Qt-727ec8c564a3947784bfe371b39615f965d530ec.zip Qt-727ec8c564a3947784bfe371b39615f965d530ec.tar.gz Qt-727ec8c564a3947784bfe371b39615f965d530ec.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/egl/qegl_p.h')
| -rw-r--r-- | src/gui/egl/qegl_p.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index ffb45aa..7dad9fe 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -55,10 +55,14 @@ 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) @@ -97,10 +101,14 @@ QT_END_INCLUDE_NAMESPACE #include <QtGui/qpaintdevice.h> +#include <QFlags> + QT_BEGIN_NAMESPACE #define QEGL_NO_CONFIG ((EGLConfig)-1) + + class QEglProperties; namespace QEgl { @@ -116,12 +124,14 @@ namespace QEgl { BestPixelFormat }; - enum ConfigOptions + enum ConfigOption { NoOptions = 0, Translucent = 0x01, Renderable = 0x02 // Config will be compatable with the paint engines (VG or GL) }; + Q_DECLARE_FLAGS(ConfigOptions, ConfigOption); + // Most of the time we use the same config for things like widgets & pixmaps, so rather than // go through the eglChooseConfig loop every time, we use defaultConfig, which will return @@ -153,6 +163,7 @@ namespace QEgl { #endif }; +Q_DECLARE_OPERATORS_FOR_FLAGS(QEgl::ConfigOptions); QT_END_NAMESPACE |