diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-09 11:43:53 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-09 11:43:53 -0700 |
| commit | 2cf5fd48d1586f961910a14324a457854cb66221 (patch) | |
| tree | 6b8690b1e3ac2b59369356d692214cc7d6a889c6 /src/mesa/drivers/dri/r200 | |
| parent | 9f44247acf62b91669f77974a4bbad687d58859e (diff) | |
| parent | f9f79c8d770e696249bd98c68b563f887562c974 (diff) | |
Merge branch 'origin' into glsl-compiler-1
Conflicts:
src/mesa/main/context.c
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_maos_arrays.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_maos_arrays.c b/src/mesa/drivers/dri/r200/r200_maos_arrays.c index 6a6c30a2b0..3162b508c2 100644 --- a/src/mesa/drivers/dri/r200/r200_maos_arrays.c +++ b/src/mesa/drivers/dri/r200/r200_maos_arrays.c @@ -420,14 +420,14 @@ void r200EmitArrays( GLcontext *ctx, GLubyte *vimap_rev ) if (!rmesa->tcl.vertex_data[i].buf) { if (ctx->VertexProgram._Enabled) emit_vector( ctx, - &(rmesa->tcl.vertex_data[attrib]), + &(rmesa->tcl.vertex_data[i]), (char *)VB->AttribPtr[attrib]->data, 1, VB->AttribPtr[attrib]->stride, count); else emit_vecfog( ctx, - &(rmesa->tcl.vertex_data[attrib]), + &(rmesa->tcl.vertex_data[i]), (char *)VB->AttribPtr[attrib]->data, VB->AttribPtr[attrib]->stride, count); |