diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-05-11 16:28:44 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-05-11 16:28:44 +0000 |
| commit | 5ed3042aeeb3e7cee7cf537c36e4aa32a7688fd1 (patch) | |
| tree | 020d443c7e685f16cf0c9037946fad2e3109e41b | |
| parent | 60aa3ee301897e7670927895527903b9db1796dc (diff) | |
fixes for bug 6863 from trunk
| -rw-r--r-- | src/glx/x11/indirect_vertex_array.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glx/x11/indirect_vertex_array.c b/src/glx/x11/indirect_vertex_array.c index 9c9766a41c..5a5cd6697e 100644 --- a/src/glx/x11/indirect_vertex_array.c +++ b/src/glx/x11/indirect_vertex_array.c @@ -420,7 +420,6 @@ fill_array_info_cache( struct array_state_vector * arrays ) } } - if ( arrays->new_DrawArrays_possible ) { assert( ! arrays->new_DrawArrays_possible ); } @@ -1592,7 +1591,7 @@ void __indirect_glClientActiveTextureARB(GLenum texture) const GLint unit = (GLint) texture - GL_TEXTURE0; - if ( (unit < 0) || (unit > arrays->num_texture_units) ) { + if ( (unit < 0) || (unit >= arrays->num_texture_units) ) { __glXSetError(gc, GL_INVALID_ENUM); return; } @@ -1767,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; } |