In __glXPushArrayState() we weren't pushing the index field.

But later, in __glXPopArrayState(), we were using that field to set
the active_texture_unit.  The value was garbage and could lead to
things blowing up.
See bug 6863.
This commit is contained in:
Brian Paul
2006-05-11 16:27:39 +00:00
parent fa489dd043
commit 88cf5aa783
+2 -1
View File
@@ -1766,13 +1766,14 @@ __glXPushArrayState( __GLXattribute * state )
struct array_stack_state * stack = & arrays->stack[ (arrays->stack_index * arrays->num_arrays)];
unsigned i;
/* XXX are we pushing _all_ the necessary fields? */
for ( i = 0 ; i < arrays->num_arrays ; i++ ) {
stack[i].data = arrays->arrays[i].data;
stack[i].data_type = arrays->arrays[i].data_type;
stack[i].user_stride = arrays->arrays[i].user_stride;
stack[i].count = arrays->arrays[i].count;
stack[i].key = arrays->arrays[i].key;
stack[i].index = arrays->arrays[i].index;
stack[i].enabled = arrays->arrays[i].enabled;
}