1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rhi: gl: Add missing bindBuffer

Browse Source 
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>
This commit is contained in:
Laszlo Agocs 2024-07-02 17:52:52 +02:00 committed by Qt Cherry-pick Bot
parent 9c3ab9a17e
commit 9745c3d708
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/rhi/qrhi.cpp
View File

@ -3930,7 +3930,7 @@ QRhiResource::Type QRhiBuffer::resourceType() const
*/ */
QRhiBuffer::NativeBuffer QRhiBuffer::nativeBuffer() QRhiBuffer::NativeBuffer QRhiBuffer::nativeBuffer()
{ {
return {}; return { {}, 0 };
} }
/*! /*!

1
src/gui/rhi/qrhigles2.cpp
View File

@ -5356,6 +5356,7 @@ void QGles2Buffer::endFullDynamicBufferUpdateForCurrentFrame()
{ {
if (!m_usage.testFlag(UniformBuffer)) { if (!m_usage.testFlag(UniformBuffer)) {
QRHI_RES_RHI(QRhiGles2); QRHI_RES_RHI(QRhiGles2);
rhiD->f->glBindBuffer(targetForDataOps, buffer);
if (rhiD->caps.properMapBuffer) if (rhiD->caps.properMapBuffer)
rhiD->f->glUnmapBuffer(targetForDataOps); rhiD->f->glUnmapBuffer(targetForDataOps);
else else