diff options
| author | Chia-I Wu <olv@lunarg.com> | 2010-08-07 21:02:13 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2010-08-16 20:57:08 +0800 |
| commit | c3fee80f2b35f6a7e48d6015bfc759c66b7e1a2c (patch) | |
| tree | c668b07911e2a7efbee291f79e1c7908b2a8dd26 /src/gallium/auxiliary/draw/draw_pipe.c | |
| parent | a072f0e186522f9de2848989422ad0244f65c961 (diff) | |
draw: Remove DRAW_PIPE_MAX_VERTICES and DRAW_PIPE_FLAG_MASK.
The higher bits of draw elements are no longer used for the stipple or
edge flags.
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_pipe.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pipe.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe.c b/src/gallium/auxiliary/draw/draw_pipe.c index 43c25167a9..b75262a357 100644 --- a/src/gallium/auxiliary/draw/draw_pipe.c +++ b/src/gallium/auxiliary/draw/draw_pipe.c @@ -173,27 +173,23 @@ static void do_triangle( struct draw_context *draw, #define TRIANGLE(flags,i0,i1,i2) \ do { \ - assert(!((i1) & DRAW_PIPE_FLAG_MASK)); \ - assert(!((i2) & DRAW_PIPE_FLAG_MASK)); \ do_triangle( draw, \ flags, \ - verts + stride * (i0 & ~DRAW_PIPE_FLAG_MASK), \ + verts + stride * (i0), \ verts + stride * (i1), \ verts + stride * (i2) ); \ } while (0) #define LINE(flags,i0,i1) \ do { \ - assert(!((i1) & DRAW_PIPE_FLAG_MASK)); \ do_line( draw, \ flags, \ - verts + stride * (i0 & ~DRAW_PIPE_FLAG_MASK), \ + verts + stride * (i0), \ verts + stride * (i1) ); \ } while (0) #define POINT(i0) \ do { \ - assert(!((i0) & DRAW_PIPE_FLAG_MASK)); \ do_point( draw, verts + stride * (i0) ); \ } while (0) @@ -247,8 +243,7 @@ void draw_pipeline_run( struct draw_context *draw, unsigned max_index = 0x0, i; /* find the largest element index */ for (i = 0; i < count; i++) { - unsigned int index = (prim_info->elts[start + i] - & ~DRAW_PIPE_FLAG_MASK); + unsigned int index = prim_info->elts[start + i]; if (index > max_index) max_index = index; } |