[Mesa-dev] [PATCH V4 00/19] ARB_texture_multisample support

[Chris Forbes]

I missed a case in attrib.c; this small patch should be folded in with
the rest of the changes which add support for the new targets:

commit 8b16367bab07cfe2eb44cc96a22bb925593b1e20
Author: Chris Forbes <chrisf at ijw.co.nz>
Date:   Sat Mar 2 09:10:25 2013 +1300

    fixup glPopAttrib(GL_TEXTURE_BIT)

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index a951283..5bb63ea 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -767,6 +767,9 @@ pop_texture_group(struct gl_context *ctx, struct
texture_state *texstate)
             continue;
          else if (obj->Target == GL_TEXTURE_EXTERNAL_OES)
             continue;
+         else if (obj->Target == GL_TEXTURE_2D_MULTISAMPLE ||
+                  obj->Target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY)
+            continue;

          target = obj->Target;