diff options
| author | Marek Olšák <[email protected]> | 2017-04-02 16:24:39 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-05-10 19:00:16 +0200 |
| commit | 330d0607ed60fd3edca192e54b4246310f06652f (patch) | |
| tree | 56bceba5b291ffcf42209ef1ab7ec515a8f5b666 /src/gallium/auxiliary/draw | |
| parent | 22f6624ed318e8131681ec1f2e7b3a59449df412 (diff) | |
gallium: remove pipe_index_buffer and set_index_buffer
pipe_draw_info::indexed is replaced with index_size. index_size == 0 means
non-indexed.
Instead of pipe_index_buffer::offset, pipe_draw_info::start is used.
For indexed indirect draws, pipe_draw_info::start is added to the indirect
start. This is the only case when "start" affects indirect draws.
pipe_draw_info::index is a union. Use either index::resource or
index::user depending on the value of pipe_draw_info::has_user_indices.
v2: fixes for nine, svga
Diffstat (limited to 'src/gallium/auxiliary/draw')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_context.c | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pt.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c index 0eee0751069..9791ec5506a 100644 --- a/src/gallium/auxiliary/draw/draw_context.c +++ b/src/gallium/auxiliary/draw/draw_context.c @@ -777,9 +777,6 @@ void draw_set_render( struct draw_context *draw, /** * Tell the draw module where vertex indexes/elements are located, and * their size (in bytes). - * - * Note: the caller must apply the pipe_index_buffer::offset value to - * the address. The draw module doesn't do that. */ void draw_set_indexes(struct draw_context *draw, diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c index 5a49acb64d3..be76a30f97c 100644 --- a/src/gallium/auxiliary/draw/draw_pt.c +++ b/src/gallium/auxiliary/draw/draw_pt.c @@ -443,7 +443,7 @@ resolve_draw_info(const struct pipe_draw_info *raw_info, info->count = target->internal_offset / vertex_buffer->stride; /* Stream output draw can not be indexed */ - debug_assert(!info->indexed); + debug_assert(!info->index_size); info->max_index = info->count - 1; } } @@ -473,7 +473,7 @@ draw_vbo(struct draw_context *draw, info = &resolved_info; assert(info->instance_count > 0); - if (info->indexed) + if (info->index_size) assert(draw->pt.user.elts); count = info->count; @@ -481,7 +481,7 @@ draw_vbo(struct draw_context *draw, draw->pt.user.eltBias = info->index_bias; draw->pt.user.min_index = info->min_index; draw->pt.user.max_index = info->max_index; - draw->pt.user.eltSize = info->indexed ? draw->pt.user.eltSizeIB : 0; + draw->pt.user.eltSize = info->index_size ? draw->pt.user.eltSizeIB : 0; if (0) debug_printf("draw_vbo(mode=%u start=%u count=%u):\n", |