From 9745c3d708e9fb56a4fd68f257df9a6a1e2c7f1a Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Tue, 2 Jul 2024 17:52:52 +0200
Subject: [PATCH] rhi: gl: Add missing bindBuffer

And make sure the default nativeBuffers(), used e.g. by the Null
backend, correctly zeroes out the slotCount, which will be relevant
for Qt Quick.

Task-number: QTBUG-125087
Pick-to: 6.7 6.6 6.5
Change-Id: Ia3a0ac82818821f7068b380e33a0dd42db87b349
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit d6906fb5975e7e1442836ab5c894f69c90a3e5a9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/rhi/qrhi.cpp      | 2 +-
 src/gui/rhi/qrhigles2.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
index 5cdb13e593d..99230a2b560 100644
--- a/src/gui/rhi/qrhi.cpp
+++ b/src/gui/rhi/qrhi.cpp
@@ -3930,7 +3930,7 @@ QRhiResource::Type QRhiBuffer::resourceType() const
  */
 QRhiBuffer::NativeBuffer QRhiBuffer::nativeBuffer()
 {
-    return {};
+    return { {}, 0 };
 }
 
 /*!
diff --git a/src/gui/rhi/qrhigles2.cpp b/src/gui/rhi/qrhigles2.cpp
index 7e886a5d002..3c2389e18f9 100644
--- a/src/gui/rhi/qrhigles2.cpp
+++ b/src/gui/rhi/qrhigles2.cpp
@@ -5356,6 +5356,7 @@ void QGles2Buffer::endFullDynamicBufferUpdateForCurrentFrame()
 {
     if (!m_usage.testFlag(UniformBuffer)) {
         QRHI_RES_RHI(QRhiGles2);
+        rhiD->f->glBindBuffer(targetForDataOps, buffer);
         if (rhiD->caps.properMapBuffer)
             rhiD->f->glUnmapBuffer(targetForDataOps);
         else