diff options
| author | Marek Olšák <[email protected]> | 2012-09-14 17:03:25 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-09-22 14:22:15 +0200 |
| commit | 38d1191f4133dc427fccdbaec61bef33201c2dcc (patch) | |
| tree | 16a0d18b9cd60ba19cbbe1371fd12d6321c81939 /src | |
| parent | a940c74bc3bb129b074601cc7967c331e2b97322 (diff) | |
draw: fix non-indexed draw calls if there's an index buffer
pipe_draw_info::indexed determines if it should be indexed and not
the presence of an index buffer.
This fixes crashes in r300g.
NOTE: This is a candidate for the stable branches.
Tested-by: Michel Dänzer <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
(cherry picked from commit 2988fa940e1d8a4531fddff4d554eec1e6e04474)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_private.h | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pt.c | 11 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c index 1aa9b615bc8..53be8f7eac5 100644 --- a/src/gallium/auxiliary/draw/draw_context.c +++ b/src/gallium/auxiliary/draw/draw_context.c @@ -621,7 +621,7 @@ draw_set_indexes(struct draw_context *draw, elem_size == 2 || elem_size == 4); draw->pt.user.elts = elements; - draw->pt.user.eltSize = elem_size; + draw->pt.user.eltSizeIB = elem_size; } diff --git a/src/gallium/auxiliary/draw/draw_private.h b/src/gallium/auxiliary/draw/draw_private.h index c2af0f36bca..5c497c64718 100644 --- a/src/gallium/auxiliary/draw/draw_private.h +++ b/src/gallium/auxiliary/draw/draw_private.h @@ -174,6 +174,7 @@ struct draw_context /** vertex element/index buffer (ex: glDrawElements) */ const void *elts; /** bytes per index (0, 1, 2 or 4) */ + unsigned eltSizeIB; unsigned eltSize; int eltBias; unsigned min_index; diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c index 5b6eaa739d0..08e06e84aed 100644 --- a/src/gallium/auxiliary/draw/draw_pt.c +++ b/src/gallium/auxiliary/draw/draw_pt.c @@ -362,7 +362,7 @@ draw_pt_arrays_restart(struct draw_context *draw, assert(info->primitive_restart); - if (draw->pt.user.elts) { + if (draw->pt.user.eltSize) { /* indexed prims (draw_elements) */ cur_start = start; cur_count = 0; @@ -433,12 +433,8 @@ draw_arrays_instanced(struct draw_context *draw, info.count = count; info.start_instance = startInstance; info.instance_count = instanceCount; - - info.indexed = (draw->pt.user.elts != NULL); - if (!info.indexed) { - info.min_index = start; - info.max_index = start + count - 1; - } + info.min_index = start; + info.max_index = start + count - 1; draw_vbo(draw, &info); } @@ -465,6 +461,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; if (0) debug_printf("draw_vbo(mode=%u start=%u count=%u):\n", |