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/opengl/qglframebufferobject_p.h | |
| parent | fe2ce05d23a52d27e50270d22eb9fff9ab091dd4 (diff) | |
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/opengl/qglframebufferobject_p.h')
| -rw-r--r-- | src/opengl/qglframebufferobject_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h index 3b36c5c2b6..0edce5da2f 100644 --- a/src/opengl/qglframebufferobject_p.h +++ b/src/opengl/qglframebufferobject_p.h @@ -71,7 +71,9 @@ public: mipmap(false) { #ifndef QT_OPENGL_ES_2 - internal_format = QOpenGLFunctions::isES() ? GL_RGBA : GL_RGBA8; + QOpenGLContext *ctx = QOpenGLContext::currentContext(); + const bool isES = ctx ? ctx->isES() : QOpenGLContext::openGLModuleType() != QOpenGLContext::DesktopGL; + internal_format = isES ? GL_RGBA : GL_RGBA8; #else internal_format = GL_RGBA; #endif |