[Mesa-stable] [PATCH] Revert "mesa: do not trigger _NEW_TEXTURE_STATE in glActiveTexture()"

Samuel Pitoiset samuel.pitoiset at gmail.com
Wed Mar 14 08:46:33 UTC 2018


This reverts commit f314a532fdc7af8381586144d2631d9968331f05.

This appears to introduce some blinking textures in UT2004. Not
sure exactly what's the root cause because we don't have much
information about the issue.

Anyway, this was just a micro optimization that actually breaks,
at least, one app almost one year later.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105436
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
 src/mesa/main/texstate.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index f9f50a3005..f9b00b4a8f 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -310,6 +310,8 @@ active_texture(GLenum texture, bool no_error)
       }
    }
 
+   FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE);
+
    ctx->Texture.CurrentUnit = texUnit;
    if (ctx->Transform.MatrixMode == GL_TEXTURE) {
       /* update current stack pointer */
-- 
2.16.2



More information about the mesa-stable mailing list