summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-07-05 22:26:43 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-07-05 22:26:43 +0000
commit6479a175e4e633fa15075030b729553a5481c4cb (patch)
tree630d9784f11c9d14196b111b8d9cf4490fca6c05
parent08b082ae1a7e718144615e4ed7f060f77c4aead7 (diff)
added texture cube map state save/restore
-rw-r--r--src/mesa/main/attrib.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 41714dd20a..41bd884be9 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,8 +1,8 @@
-/* $Id: attrib.c,v 1.23 2000/05/07 20:41:30 brianp Exp $ */
+/* $Id: attrib.c,v 1.24 2000/07/05 22:26:43 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.1
+ * Version: 3.3
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -359,6 +359,7 @@ _mesa_PushAttrib(GLbitfield mask)
copy_texobj_state(&attr->Unit[u].Saved1D, attr->Unit[u].CurrentD[1]);
copy_texobj_state(&attr->Unit[u].Saved2D, attr->Unit[u].CurrentD[2]);
copy_texobj_state(&attr->Unit[u].Saved3D, attr->Unit[u].CurrentD[3]);
+ copy_texobj_state(&attr->Unit[u].SavedCubeMap, attr->Unit[u].CurrentCubeMap);
}
newnode = new_attrib_node( GL_TEXTURE_BIT );
newnode->data = attr;
@@ -770,9 +771,13 @@ _mesa_PopAttrib(void)
&(ctx->Texture.Unit[u].Saved2D) );
copy_texobj_state( ctx->Texture.Unit[u].CurrentD[3],
&(ctx->Texture.Unit[u].Saved3D) );
+ copy_texobj_state( ctx->Texture.Unit[u].CurrentCubeMap,
+ &(ctx->Texture.Unit[u].SavedCubeMap) );
+
gl_put_texobj_on_dirty_list( ctx, ctx->Texture.Unit[u].CurrentD[1] );
gl_put_texobj_on_dirty_list( ctx, ctx->Texture.Unit[u].CurrentD[2] );
gl_put_texobj_on_dirty_list( ctx, ctx->Texture.Unit[u].CurrentD[3] );
+ gl_put_texobj_on_dirty_list( ctx, ctx->Texture.Unit[u].CurrentCubeMap );
}
}