Commit f02f1ad1 authored by Samuel Pitoiset's avatar Samuel Pitoiset
Browse files

Revert "mesa: do not trigger _NEW_TEXTURE_STATE in glActiveTexture()"

This reverts commit f314a532.

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.


Cc: <>
Signed-off-by: Samuel Pitoiset's avatarSamuel Pitoiset <>
Reviewed-by: Timothy Arceri's avatarTimothy Arceri <>
parent 51783f3e
...@@ -310,6 +310,19 @@ active_texture(GLenum texture, bool no_error) ...@@ -310,6 +310,19 @@ active_texture(GLenum texture, bool no_error)
} }
} }
/* The below flush call seems useless because
* gl_context::Texture::CurrentUnit is not used by
* _mesa_update_texture_state() and friends.
* However removing the flush
* introduced some blinking textures in UT2004. More investigation is
* needed to find the root cause.
ctx->Texture.CurrentUnit = texUnit; ctx->Texture.CurrentUnit = texUnit;
if (ctx->Transform.MatrixMode == GL_TEXTURE) { if (ctx->Transform.MatrixMode == GL_TEXTURE) {
/* update current stack pointer */ /* update current stack pointer */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment