diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-02-03 17:37:01 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-02-03 17:37:01 +0100 |
| commit | 5aa997dafbe9cccba2c837d64ddc06e495f6fd71 (patch) | |
| tree | 324fc86dad44390c5914a9742525aa78c695157d /src/mesa/drivers/dri/r200/r200_maos_arrays.c | |
| parent | cf4ccd5020743591b8d2b29df279c729004ca393 (diff) | |
| parent | de24b01b05d4c7402c06851dd7dbbb5854b1ff41 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_maos_arrays.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_maos_arrays.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_maos_arrays.c b/src/mesa/drivers/dri/r200/r200_maos_arrays.c index 270dc35a46..db5ac6fc8a 100644 --- a/src/mesa/drivers/dri/r200/r200_maos_arrays.c +++ b/src/mesa/drivers/dri/r200/r200_maos_arrays.c @@ -664,14 +664,13 @@ void r200EmitArrays( GLcontext *ctx, GLuint inputs ) */ if (vfmt0 != rmesa->hw.vtx.cmd[VTX_VTXFMT_0] || - vfmt1 != rmesa->hw.vtx.cmd[VTX_VTXFMT_1]) { - R200_STATECHANGE( rmesa, vtx ); + vfmt1 != rmesa->hw.vtx.cmd[VTX_VTXFMT_1]) { + R200_STATECHANGE( rmesa, vtx ); rmesa->hw.vtx.cmd[VTX_VTXFMT_0] = vfmt0; rmesa->hw.vtx.cmd[VTX_VTXFMT_1] = vfmt1; - } + } rmesa->tcl.nr_aos_components = nr; - rmesa->tcl.vertex_format = vfmt0; } |