diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-10-24 14:35:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 12:37:51 +0100 |
| commit | ba92fe922244a66b4851a049af61cf9be7b1bc9d (patch) | |
| tree | 9fd717a158a23779eb443d012f7552c9bdc0890b /src | |
| parent | 73b682d816ec12afbf8064a44e462dd89e4c38df (diff) | |
Re-added hellogl_es and ES 1 support for QOpenGLContext.
Change-Id: I576cf3595cdeeefb4ed840bb3b2b7097b3609cc7
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src')
4 files changed, 10 insertions, 6 deletions
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index 33b04cc708..b200cdb113 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -69,8 +69,8 @@ public: , swapBehavior(QSurfaceFormat::DefaultSwapBehavior) , numSamples(-1) , profile(QSurfaceFormat::NoProfile) - , major(1) - , minor(1) + , major(2) + , minor(0) { } @@ -399,6 +399,8 @@ void QSurfaceFormat::setMajorVersion(int major) /*! Returns the major OpenGL version. + + The default version is 2.0. */ int QSurfaceFormat::majorVersion() const { @@ -407,6 +409,8 @@ int QSurfaceFormat::majorVersion() const /*! Sets the desired minor OpenGL version. + + The default version is 2.0. */ void QSurfaceFormat::setMinorVersion(int minor) { diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp index b864378470..ea4b5566c5 100644 --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp @@ -212,7 +212,7 @@ EGLConfig q_configFromGLFormat(EGLDisplay display, const QSurfaceFormat &format, configureAttributes.append(surfaceType); configureAttributes.append(EGL_RENDERABLE_TYPE); - configureAttributes.append(EGL_OPENGL_ES2_BIT); + configureAttributes.append(format.majorVersion() == 1 ? EGL_OPENGL_ES_BIT : EGL_OPENGL_ES2_BIT); configureAttributes.append(EGL_NONE); do { diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp index 58debb8ba8..dfa0bacd35 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp @@ -48,7 +48,7 @@ #include <EGL/egl.h> QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, - EGLint eglClientVersion, EGLenum eglApi) + EGLenum eglApi) : m_eglDisplay(display) , m_eglApi(eglApi) , m_format(format) @@ -60,7 +60,7 @@ QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat &format, QPlatform QVector<EGLint> contextAttrs; contextAttrs.append(EGL_CONTEXT_CLIENT_VERSION); - contextAttrs.append(eglClientVersion); + contextAttrs.append(format.majorVersion()); contextAttrs.append(EGL_NONE); eglBindAPI(m_eglApi); diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h index 2fe0e04388..c38af1dfda 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h +++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h @@ -50,7 +50,7 @@ class QEGLPlatformContext : public QPlatformOpenGLContext { public: QEGLPlatformContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, - EGLint eglClientVersion = 2, EGLenum eglApi = EGL_OPENGL_ES_API); + EGLenum eglApi = EGL_OPENGL_ES_API); ~QEGLPlatformContext(); bool makeCurrent(QPlatformSurface *surface); |