AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rhi: gl: Fix missing texture bindings

Browse Source 
The block to update the cached state needs to be run also
when the texture parameters have changed.

Change-Id: Ifa80c142c6ff31c95a718a1a900ff3db0bbfe4bc
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
This commit is contained in:
Laszlo Agocs 2020-10-07 14:52:58 +02:00
parent 96eea43d3b
commit ea227fb915
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3093,8 +3093,9 @@ void QRhiGles2::bindShaderResources(QGles2CommandBuffer *cbD,
for (const QGles2SamplerDescription &shaderSampler : samplers) {
if (shaderSampler.binding == b->binding) {
const bool samplerStateValid = texD->samplerState == samplerD->d;
const bool cachedStateInRange = texUnit < 16;
bool updateTextureBinding = true;
if (samplerStateValid && texUnit < 16) {
if (samplerStateValid && cachedStateInRange) {
// If we already encountered the same texture with
// the same pipeline for this texture unit in the
// current pass, then the shader program already
@ -3107,10 +3108,6 @@ void QRhiGles2::bindShaderResources(QGles2CommandBuffer *cbD,
&& cbD->textureUnitState[texUnit].texture == texD->texture)
{
updateTextureBinding = false;
} else {
cbD->textureUnitState[texUnit].ps = ps;
cbD->textureUnitState[texUnit].psGeneration = psGeneration;
cbD->textureUnitState[texUnit].texture = texD->texture;
}
}
if (updateTextureBinding) {
@ -3118,6 +3115,11 @@ void QRhiGles2::bindShaderResources(QGles2CommandBuffer *cbD,
activeTexUnitAltered = true;
f->glBindTexture(texD->target, texD->texture);
f->glUniform1i(shaderSampler.glslLocation + elem, texUnit);
if (cachedStateInRange) {
cbD->textureUnitState[texUnit].ps = ps;
cbD->textureUnitState[texUnit].psGeneration = psGeneration;
cbD->textureUnitState[texUnit].texture = texD->texture;
}
}
++texUnit;
if (!samplerStateValid) {