Mesa (master): mesa: pop all textures up to NumCurrentTexUsed, not just MaxTextureUnits

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: c679e7debd6198a163a8658f5696be9d169e3b05
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c679e7debd6198a163a8658f5696be9d169e3b05

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Dec 19 23:02:16 2020 -0500

mesa: pop all textures up to NumCurrentTexUsed, not just MaxTextureUnits

glPush/PopAttrib had 2 defects:
- Only MaxTextureUnits were pushed and popped (which is 8 at most).
- If some texture units had been unused, we would still push/pop them.

This fix changes how many units we push and pop to NumCurrentTexUsed,
which is the maximum texture unit + 1 that was used to by the user.

This commit:
- In glPushAttrib, save NumCurrentTexUsed texture units.
- In glPopAttrib, restore the same number of texture units, and if
  NumCurrentTexUsed has increased since glPushAttrib, bind 0 in the newly
  used units to get them to the state before glPushAttrib.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8181>

---

 src/mesa/main/attrib.c | 42 ++++++++++++++++++++++++++++++++++++++++--
 src/mesa/main/mtypes.h |  1 +
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index c06695c6240..60615872ea8 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -276,7 +276,8 @@ _mesa_PushAttrib(GLbitfield mask)
       }
 
       /* copy state/contents of the currently bound texture objects */
-      for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
+      unsigned num_tex_used = ctx->Texture.NumCurrentTexUsed;
+      for (u = 0; u < num_tex_used; u++) {
          head->Texture.LodBias[u] = ctx->Texture.Unit[u].LodBias;
 
          for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
@@ -290,6 +291,7 @@ _mesa_PushAttrib(GLbitfield mask)
                copy_texture_attribs(dst, src, tex);
          }
       }
+      head->Texture.NumTexSaved = num_tex_used;
       _mesa_unlock_context_textures(ctx);
    }
 
@@ -537,12 +539,12 @@ pop_texture_group(struct gl_context *ctx, struct gl_texture_attrib_node *texstat
 
    _mesa_lock_context_textures(ctx);
 
+   /* Restore fixed-function texture unit states. */
    for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
       const struct gl_fixedfunc_texture_unit *unit =
          &texstate->FixedFuncUnit[u];
       struct gl_fixedfunc_texture_unit *destUnit =
          &ctx->Texture.FixedFuncUnit[u];
-      GLuint tgt;
 
       ctx->Texture.CurrentUnit = u;
 
@@ -619,6 +621,14 @@ pop_texture_group(struct gl_context *ctx, struct gl_texture_attrib_node *texstat
          destUnit->_CurrentCombine = NULL;
          ctx->Texture.Unit[u].LodBias = texstate->LodBias[u];
       }
+   }
+
+   /* Restore saved textures. */
+   unsigned num_tex_saved = texstate->NumTexSaved;
+   for (u = 0; u < num_tex_saved; u++) {
+      gl_texture_index tgt;
+
+      ctx->Texture.CurrentUnit = u;
 
       /* Restore texture object state for each target */
       for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
@@ -654,6 +664,34 @@ pop_texture_group(struct gl_context *ctx, struct gl_texture_attrib_node *texstat
       }
    }
 
+   /* Restore textures in units that were not used before glPushAttrib (thus
+    * they were not saved) but were used after glPushAttrib. Revert
+    * the bindings to Name = 0.
+    */
+   unsigned num_tex_changed = ctx->Texture.NumCurrentTexUsed;
+   for (u = num_tex_saved; u < num_tex_changed; u++) {
+      ctx->Texture.CurrentUnit = u;
+
+      for (gl_texture_index tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
+         struct gl_texture_object *texObj =
+            _mesa_get_tex_unit(ctx, u)->CurrentTex[tgt];
+         bool is_msaa = tgt == TEXTURE_2D_MULTISAMPLE_INDEX ||
+                        tgt == TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX;
+
+         /* According to the OpenGL 4.6 Compatibility Profile specification,
+          * table 23.17, GL_TEXTURE_BINDING_2D_MULTISAMPLE and
+          * GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY do not belong in the
+          * texture attrib group.
+          */
+         if (!is_msaa && texObj->Name != 0) {
+            /* We don't need to check whether the texture target is supported,
+             * because we wouldn't get in this conditional block if it wasn't.
+             */
+            _mesa_BindTexture_no_error(texObj->Target, 0);
+         }
+      }
+   }
+
    /* Restore default texture object states. */
    for (gl_texture_index tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
       struct gl_texture_object *dst = ctx->Shared->DefaultTex[tex];
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c88b31508ca..2c7bdf4fa66 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -5048,6 +5048,7 @@ struct gl_enable_attrib_node
 struct gl_texture_attrib_node
 {
    GLuint CurrentUnit;   /**< GL_ACTIVE_TEXTURE */
+   GLuint NumTexSaved;
    GLbitfield8 _TexGenEnabled;
    GLbitfield8 _GenFlags;
    struct gl_fixedfunc_texture_unit FixedFuncUnit[MAX_TEXTURE_COORD_UNITS];