From 0a8d741b6d9bbca485a8e8191564763762977cc3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 18 Nov 2022 07:35:00 -0500 Subject: [PATCH] mesa: don't flag _NEW_PROGRAM for "texture_unit -> sampler" mapping changes st/mesa just reorders sampler views, so we only need to rebind those. Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/main/uniform_query.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 6135c80..70bf681 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -1551,7 +1551,7 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values, */ if (sampler->unit != value || !sampler->bound) { if (!flushed) { - FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT | _NEW_PROGRAM, 0); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT, 0); flushed = true; } sampler->unit = value; @@ -1562,7 +1562,7 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values, } else { if (sh->Program->SamplerUnits[unit] != value) { if (!flushed) { - FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT | _NEW_PROGRAM, 0); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_OBJECT, 0); flushed = true; } sh->Program->SamplerUnits[unit] = value; -- 2.7.4