aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickframebufferobject.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-06-10 08:42:47 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-06-10 23:07:32 +0200
commite96ebaec7de454ac0f39a2fc53f687faac9ae8ff (patch)
treed7a295ab2bee201d973cc86ea22e0cc993fa1596 /src/quick/items/qquickframebufferobject.cpp
parentbe30dad8e591cc460d304e1074eae0ef3ecbf913 (diff)
QQuickFbo: remove direct GL check
This is always used in combination with OpenGL-on-RHI now, no point in checking for direct OpenGL anymore. Change-Id: I0f137d7c5f6248d9d9790949186e4830ffd7dc7f Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/items/qquickframebufferobject.cpp')
-rw-r--r--src/quick/items/qquickframebufferobject.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp
index 3ff6f857ab..1463d02c65 100644
--- a/src/quick/items/qquickframebufferobject.cpp
+++ b/src/quick/items/qquickframebufferobject.cpp
@@ -236,11 +236,8 @@ public Q_SLOTS:
if (renderPending) {
renderPending = false;
- const bool needsWrap = QSGRendererInterface::isApiRhiBased(window->rendererInterface()->graphicsApi());
- if (needsWrap) {
- window->beginExternalCommands();
- window->resetOpenGLState();
- }
+ window->beginExternalCommands();
+ window->resetOpenGLState();
fbo->bind();
QOpenGLContext::currentContext()->functions()->glViewport(0, 0, fbo->width(), fbo->height());
@@ -250,8 +247,7 @@ public Q_SLOTS:
if (msDisplayFbo)
QOpenGLFramebufferObject::blitFramebuffer(msDisplayFbo, fbo);
- if (needsWrap)
- window->endExternalCommands();
+ window->endExternalCommands();
markDirty(QSGNode::DirtyMaterial);
emit textureChanged();