summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2022-12-16 09:49:59 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-12-16 14:16:03 +0000
commitf99038ec3d6dfb5f01135860dc07294b7427843e (patch)
treeaf232966390d49f90190ab771e700f81ecae196c
parent8d9e4b000a11aad1b511be34595d800015990f28 (diff)
Do not assert in Android VideoOutput in debug builds
The pattern of passing the same resource update batch to both beginPass() and endPass() will cause a failing assert in endPass(). Change-Id: I3787722d426dabaf3ccee79cf1dcd701c224700c Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> (cherry picked from commit 88d2477f9cdf302d2f27b3d0929c1990778be75d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/multimedia/android/common/qandroidvideooutput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp
index ffda18378..38029c479 100644
--- a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp
+++ b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp
@@ -226,7 +226,7 @@ std::unique_ptr<QRhiTexture> TextureCopy::copyExternalTexture(QSize size, const
cb->setShaderResources(m_srb.get());
cb->setVertexInput(0, 1, &vbufBinding);
cb->draw(4);
- cb->endPass(rub);
+ cb->endPass();
m_rhi->endOffscreenFrame();
QOpenGLContext *ctx = QOpenGLContext::currentContext();