diff options
| author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-28 12:42:42 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-28 12:42:42 +0200 |
| commit | 938d9d596324e411fde5312f2bb65b444c502c37 (patch) | |
| tree | f32087f7c61f0827980278a5dae2b32edf534b72 /src/gallium/auxiliary/draw/draw_pipe_aaline.c | |
| parent | 5d90f97f48f8ba231d52bb1a4758dd37f81ec8d6 (diff) | |
| parent | 7b85ea19de09d4e7e077ca147528e90e52683690 (diff) | |
Merge branch 'gallium-vertex-linear' into gallium-0.1
Conflicts:
src/gallium/auxiliary/draw/draw_pt_varray.c
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_pipe_aaline.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pipe_aaline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_aaline.c b/src/gallium/auxiliary/draw/draw_pipe_aaline.c index b1ed8aa24e..fd48b224b4 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_aaline.c +++ b/src/gallium/auxiliary/draw/draw_pipe_aaline.c @@ -653,7 +653,7 @@ aaline_first_line(struct draw_stage *stage, struct prim_header *header) } /* update vertex attrib info */ - aaline->tex_slot = draw->num_vs_outputs; + aaline->tex_slot = draw->vs.num_vs_outputs; assert(aaline->tex_slot > 0); /* output[0] is vertex pos */ /* advertise the extra post-transformed vertex attribute */ |