diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-02-28 17:03:57 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-04 15:59:05 +0100 |
commit | 4b2f35d04ca3c2e037b4d0edd8b2350051cc572c (patch) | |
tree | b6cf33e9cba3e55b11be748fa37fd44b09021b54 /src/gui/opengl/qopengltimerquery.cpp | |
parent | fe2ce05d23a52d27e50270d22eb9fff9ab091dd4 (diff) | |
download | qtbase-4b2f35d04ca3c2e037b4d0edd8b2350051cc572c.tar.gz |
Dynamic GL: remove exporting symbols
Remove the opengl proxy for now. Later it will either be moved into
a separate library or replaced by a QOpenGLFunctions-based approach.
This means that the -opengl dynamic configuration is not usable
for the time being. The rest of the enablers remain in place.
The convenience function QOpenGLFunctions::isES() is now moved to
QOpenGLContext and is changed to check the renderable type. This is
extremely useful since besides supporting dynamic GL it solves also
the problem of GL_ARB_ES2_compatibility (i.e. it triggers the real ES
path when creating an ES-compatible context with a desktop OpenGL
implementation).
Task-number: QTBUG-36483
Task-number: QTBUG-37172
Change-Id: I045be3fc16e9043e1528cf48e6bf0903da4fa7ca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/gui/opengl/qopengltimerquery.cpp')
-rw-r--r-- | src/gui/opengl/qopengltimerquery.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/opengl/qopengltimerquery.cpp b/src/gui/opengl/qopengltimerquery.cpp index c756e3f527..908a9cee07 100644 --- a/src/gui/opengl/qopengltimerquery.cpp +++ b/src/gui/opengl/qopengltimerquery.cpp @@ -124,11 +124,6 @@ public: bool QOpenGLTimerQueryPrivate::create() { - if (QOpenGLFunctions::isES()) { - qWarning("QOpenGLTimerQuery: Not supported on dynamic GL ES"); - return false; - } - QOpenGLContext *ctx = QOpenGLContext::currentContext(); if (timer && context == ctx) @@ -140,6 +135,11 @@ bool QOpenGLTimerQueryPrivate::create() return false; } + if (context->isES()) { + qWarning("QOpenGLTimerQuery: Not supported on OpenGL ES"); + return false; + } + // Resolve the functions provided by OpenGL 1.5 and OpenGL 3.3 or ARB_timer_query core = new QOpenGLQueryHelper(context); |