diff options
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_render.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 13 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 3 |
4 files changed, 18 insertions, 8 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index a99d50f76c0..84b8748b4c1 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -744,7 +744,7 @@ void r300_plug_in_stencil_ref_fallback(struct r300_context *r300); void r500_emit_index_bias(struct r300_context *r300, int index_bias); void r300_blitter_draw_rectangle(struct blitter_context *blitter, int x1, int y1, int x2, int y2, - float depth, + float depth, unsigned num_instances, enum blitter_attrib_type type, const union blitter_attrib *attrib); diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c index e1fabe45035..1f896da22e9 100644 --- a/src/gallium/drivers/r300/r300_render.c +++ b/src/gallium/drivers/r300/r300_render.c @@ -1114,7 +1114,7 @@ struct draw_stage* r300_draw_stage(struct r300_context* r300) * somewhat inefficient. Instead we use a rectangular point sprite. */ void r300_blitter_draw_rectangle(struct blitter_context *blitter, int x1, int y1, int x2, int y2, - float depth, + float depth, unsigned num_instances, enum blitter_attrib_type type, const union blitter_attrib *attrib) { @@ -1131,8 +1131,10 @@ void r300_blitter_draw_rectangle(struct blitter_context *blitter, /* XXX workaround for a lockup in MSAA resolve on SWTCL chipsets, this * function most probably doesn't handle type=NONE correctly */ - if (!r300->screen->caps.has_tcl && type == UTIL_BLITTER_ATTRIB_NONE) { - util_blitter_draw_rectangle(blitter, x1, y1, x2, y2, depth, type, attrib); + if ((!r300->screen->caps.has_tcl && type == UTIL_BLITTER_ATTRIB_NONE) || + num_instances > 1) { + util_blitter_draw_rectangle(blitter, x1, y1, x2, y2, depth, + num_instances, type, attrib); return; } diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 1cfab31ea33..f5f15246176 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -211,7 +211,8 @@ void r600_gfx_wait_fence(struct r600_common_context *ctx, } void r600_draw_rectangle(struct blitter_context *blitter, - int x1, int y1, int x2, int y2, float depth, + int x1, int y1, int x2, int y2, + float depth, unsigned num_instances, enum blitter_attrib_type type, const union blitter_attrib *attrib) { @@ -277,8 +278,14 @@ void r600_draw_rectangle(struct blitter_context *blitter, } /* draw */ - util_draw_vertex_buffer(&rctx->b, NULL, buf, blitter->vb_slot, offset, - R600_PRIM_RECTANGLE_LIST, 3, 2); + struct pipe_vertex_buffer vbuffer = {}; + vbuffer.buffer.resource = buf; + vbuffer.stride = 2 * 4 * sizeof(float); /* vertex size */ + vbuffer.buffer_offset = offset; + + rctx->b.set_vertex_buffers(&rctx->b, blitter->vb_slot, 1, &vbuffer); + util_draw_arrays_instanced(&rctx->b, R600_PRIM_RECTANGLE_LIST, 0, 3, + 0, num_instances); pipe_resource_reference(&buf, NULL); } diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 48536723b6c..08220bdfd8d 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -765,7 +765,8 @@ unsigned r600_gfx_write_fence_dwords(struct r600_common_screen *screen); void r600_gfx_wait_fence(struct r600_common_context *ctx, uint64_t va, uint32_t ref, uint32_t mask); void r600_draw_rectangle(struct blitter_context *blitter, - int x1, int y1, int x2, int y2, float depth, + int x1, int y1, int x2, int y2, + float depth, unsigned num_instances, enum blitter_attrib_type type, const union blitter_attrib *attrib); bool r600_common_screen_init(struct r600_common_screen *rscreen, |