From 0a2117bc9e01bc821a6f766c516665d2aa5b47d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 27 Sep 2020 11:19:46 -0400 Subject: [PATCH] mesa: call FLUSH_VERTICES before changing sampler uniforms Fixes: 9545139ce5f "mesa: skip FLUSH_VERTICES() if no samplers were changed" Reviewed-by: Ian Romanick Part-of: --- src/mesa/main/uniform_query.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 9be7e048a76..2949e47e154 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -1203,6 +1203,10 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values, /* Mark this bindless sampler as bound to a texture unit. */ if (sampler->unit != value || !sampler->bound) { + if (!flushed) { + FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT | _NEW_PROGRAM); + flushed = true; + } sampler->unit = value; changed = true; } @@ -1210,6 +1214,10 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values, sh->Program->sh.HasBoundBindlessSampler = true; } else { if (sh->Program->SamplerUnits[unit] != value) { + if (!flushed) { + FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT | _NEW_PROGRAM); + flushed = true; + } sh->Program->SamplerUnits[unit] = value; changed = true; } @@ -1217,11 +1225,6 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values, } if (changed) { - if (!flushed) { - FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT | _NEW_PROGRAM); - flushed = true; - } - struct gl_program *const prog = sh->Program; _mesa_update_shader_textures_used(shProg, prog); if (ctx->Driver.SamplerUniformChange)