whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rhi: d3d: gl: Remove incorrect exec.Cmd.Buf. assumption 

May very well be called within an active pass when going
through beginExternal() (think examples like d3d11underqml)

Change-Id: Ie98e72609308f47497d83fbe10c19ad1ae8eade3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Laszlo Agocs 2019-06-21 15:04:13 +02:00
parent 484fc8545f
commit 8862570905
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1938,8 +1938,6 @@ void QRhiD3D11::resetShaderResources()
void QRhiD3D11::executeCommandBuffer(QD3D11CommandBuffer *cbD, QD3D11SwapChain *timestampSwapChain)
{
Q_ASSERT(cbD->recordingPass == QD3D11CommandBuffer::NoPass);
quint32 stencilRef = 0;
float blendConstants[] = { 1, 1, 1, 1 };

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

@ -1500,8 +1500,6 @@ static inline GLenum toGlTextureCompareFunc(QRhiSampler::CompareOp op)
void QRhiGles2::executeCommandBuffer(QRhiCommandBuffer *cb)
{
QGles2CommandBuffer *cbD = QRHI_RES(QGles2CommandBuffer, cb);
Q_ASSERT(cbD->recordingPass == QGles2CommandBuffer::NoPass);
GLenum indexType = GL_UNSIGNED_SHORT;
quint32 indexStride = sizeof(quint16);
quint32 indexOffset = 0;