KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/u_blitter: use draw_rectangle callback for layered clears 

They are done with instancing.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Tested-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2017-08-17 02:38:23 +02:00
parent 7aaf4c73de
commit 43247c440e
6 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/gallium/auxiliary/util/u_blitter.c
View File

@ -1268,7 +1268,8 @@ static void blitter_draw(struct blitter_context_priv *ctx,
} }
void util_blitter_draw_rectangle(struct blitter_context *blitter, void util_blitter_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, enum blitter_attrib_type type,
const union blitter_attrib *attrib) const union blitter_attrib *attrib)
{ {
@ -1286,7 +1287,7 @@ void util_blitter_draw_rectangle(struct blitter_context *blitter,
default:; default:;
} }
blitter_draw(ctx, x1, y1, x2, y2, depth, 1); blitter_draw(ctx, x1, y1, x2, y2, depth, num_instances);
} }
static void *get_clear_blend_state(struct blitter_context_priv *ctx, static void *get_clear_blend_state(struct blitter_context_priv *ctx,
@ -1383,18 +1384,17 @@ static void util_blitter_clear_custom(struct blitter_context *blitter,
pipe->bind_vertex_elements_state(pipe, ctx->velem_state); pipe->bind_vertex_elements_state(pipe, ctx->velem_state);
bind_fs_write_all_cbufs(ctx); bind_fs_write_all_cbufs(ctx);
union blitter_attrib attrib;
memcpy(attrib.color, color->ui, sizeof(color->ui));
if (num_layers > 1 && ctx->has_layered) { if (num_layers > 1 && ctx->has_layered) {
blitter_set_common_draw_rect_state(ctx, false, true); blitter_set_common_draw_rect_state(ctx, false, true);
blitter_set_clear_color(ctx, color->f); blitter->draw_rectangle(blitter, 0, 0, width, height, (float) depth,
blitter_draw(ctx, 0, 0, width, height, depth, num_layers); num_layers, UTIL_BLITTER_ATTRIB_COLOR, &attrib);
} } else {
else {
union blitter_attrib attrib;
memcpy(attrib.color, color->ui, sizeof(color->ui));
blitter_set_common_draw_rect_state(ctx, false, false); blitter_set_common_draw_rect_state(ctx, false, false);
blitter->draw_rectangle(blitter, 0, 0, width, height, (float) depth, blitter->draw_rectangle(blitter, 0, 0, width, height, (float) depth,
UTIL_BLITTER_ATTRIB_COLOR, &attrib); 1, UTIL_BLITTER_ATTRIB_COLOR, &attrib);
} }
util_blitter_restore_vertex_states(blitter); util_blitter_restore_vertex_states(blitter);
@ -1644,7 +1644,7 @@ static void do_blits(struct blitter_context_priv *ctx,
pipe->set_sample_mask(pipe, ~0); pipe->set_sample_mask(pipe, ~0);
ctx->base.draw_rectangle(&ctx->base, dstbox->x, dstbox->y, ctx->base.draw_rectangle(&ctx->base, dstbox->x, dstbox->y,
dstbox->x + dstbox->width, dstbox->x + dstbox->width,
dstbox->y + dstbox->height, 0, dstbox->y + dstbox->height, 0, 1,
UTIL_BLITTER_ATTRIB_TEXCOORD, &coord); UTIL_BLITTER_ATTRIB_TEXCOORD, &coord);
} else { } else {
/* Draw the quad with the generic codepath. */ /* Draw the quad with the generic codepath. */
@ -2103,19 +2103,18 @@ void util_blitter_clear_render_target(struct blitter_context *blitter,
blitter_set_dst_dimensions(ctx, dstsurf->width, dstsurf->height); blitter_set_dst_dimensions(ctx, dstsurf->width, dstsurf->height);
union blitter_attrib attrib;
memcpy(attrib.color, color->ui, sizeof(color->ui));
num_layers = dstsurf->u.tex.last_layer - dstsurf->u.tex.first_layer + 1; num_layers = dstsurf->u.tex.last_layer - dstsurf->u.tex.first_layer + 1;
if (num_layers > 1 && ctx->has_layered) { if (num_layers > 1 && ctx->has_layered) {
blitter_set_common_draw_rect_state(ctx, false, true); blitter_set_common_draw_rect_state(ctx, false, true);
blitter_set_clear_color(ctx, color->f); blitter->draw_rectangle(blitter, dstx, dsty, dstx+width, dsty+height, 0,
blitter_draw(ctx, dstx, dsty, dstx+width, dsty+height, 0, num_layers); num_layers, UTIL_BLITTER_ATTRIB_COLOR, &attrib);
} } else {
else {
union blitter_attrib attrib;
memcpy(attrib.color, color->ui, sizeof(color->ui));
blitter_set_common_draw_rect_state(ctx, false, false); blitter_set_common_draw_rect_state(ctx, false, false);
blitter->draw_rectangle(blitter, dstx, dsty, dstx+width, dsty+height, 0, blitter->draw_rectangle(blitter, dstx, dsty, dstx+width, dsty+height, 0,
UTIL_BLITTER_ATTRIB_COLOR, &attrib); 1, UTIL_BLITTER_ATTRIB_COLOR, &attrib);
} }
util_blitter_restore_vertex_states(blitter); util_blitter_restore_vertex_states(blitter);
@ -2187,12 +2186,13 @@ void util_blitter_clear_depth_stencil(struct blitter_context *blitter,
num_layers = dstsurf->u.tex.last_layer - dstsurf->u.tex.first_layer + 1; num_layers = dstsurf->u.tex.last_layer - dstsurf->u.tex.first_layer + 1;
if (num_layers > 1 && ctx->has_layered) { if (num_layers > 1 && ctx->has_layered) {
blitter_set_common_draw_rect_state(ctx, false, true); blitter_set_common_draw_rect_state(ctx, false, true);
blitter_draw(ctx, dstx, dsty, dstx+width, dsty+height, (float) depth, num_layers); blitter->draw_rectangle(blitter, dstx, dsty, dstx+width, dsty+height,
} depth, num_layers,
else { UTIL_BLITTER_ATTRIB_NONE, NULL);
} else {
blitter_set_common_draw_rect_state(ctx, false, false); blitter_set_common_draw_rect_state(ctx, false, false);
blitter->draw_rectangle(blitter, dstx, dsty, dstx+width, dsty+height, blitter->draw_rectangle(blitter, dstx, dsty, dstx+width, dsty+height,
(float) depth, depth, 1,
UTIL_BLITTER_ATTRIB_NONE, NULL); UTIL_BLITTER_ATTRIB_NONE, NULL);
} }
@ -2253,7 +2253,7 @@ void util_blitter_custom_depth_stencil(struct blitter_context *blitter,
blitter_set_common_draw_rect_state(ctx, false, false); blitter_set_common_draw_rect_state(ctx, false, false);
blitter_set_dst_dimensions(ctx, zsurf->width, zsurf->height); blitter_set_dst_dimensions(ctx, zsurf->width, zsurf->height);
blitter->draw_rectangle(blitter, 0, 0, zsurf->width, zsurf->height, depth, blitter->draw_rectangle(blitter, 0, 0, zsurf->width, zsurf->height, depth,
UTIL_BLITTER_ATTRIB_NONE, NULL); 1, UTIL_BLITTER_ATTRIB_NONE, NULL);
util_blitter_restore_vertex_states(blitter); util_blitter_restore_vertex_states(blitter);
util_blitter_restore_fragment_states(blitter); util_blitter_restore_fragment_states(blitter);
@ -2453,7 +2453,7 @@ void util_blitter_custom_resolve_color(struct blitter_context *blitter,
blitter_set_common_draw_rect_state(ctx, false, false); blitter_set_common_draw_rect_state(ctx, false, false);
blitter_set_dst_dimensions(ctx, src->width0, src->height0); blitter_set_dst_dimensions(ctx, src->width0, src->height0);
blitter->draw_rectangle(blitter, 0, 0, src->width0, src->height0, blitter->draw_rectangle(blitter, 0, 0, src->width0, src->height0,
0, 0, NULL); 0, 1, 0, NULL);
util_blitter_restore_fb_state(blitter); util_blitter_restore_fb_state(blitter);
util_blitter_restore_vertex_states(blitter); util_blitter_restore_vertex_states(blitter);
util_blitter_restore_fragment_states(blitter); util_blitter_restore_fragment_states(blitter);
@ -2503,7 +2503,7 @@ void util_blitter_custom_color(struct blitter_context *blitter,
blitter_set_common_draw_rect_state(ctx, false, false); blitter_set_common_draw_rect_state(ctx, false, false);
blitter_set_dst_dimensions(ctx, dstsurf->width, dstsurf->height); blitter_set_dst_dimensions(ctx, dstsurf->width, dstsurf->height);
blitter->draw_rectangle(blitter, 0, 0, dstsurf->width, dstsurf->height, blitter->draw_rectangle(blitter, 0, 0, dstsurf->width, dstsurf->height,
0, 0, NULL); 0, 1, 0, NULL);
util_blitter_restore_vertex_states(blitter); util_blitter_restore_vertex_states(blitter);
util_blitter_restore_fragment_states(blitter); util_blitter_restore_fragment_states(blitter);

5
src/gallium/auxiliary/util/u_blitter.h
View File

@ -81,7 +81,7 @@ struct blitter_context
*/ */
void (*draw_rectangle)(struct blitter_context *blitter, void (*draw_rectangle)(struct blitter_context *blitter,
int x1, int y1, int x2, int y2, int x1, int y1, int x2, int y2,
float depth, float depth, unsigned num_instances,
enum blitter_attrib_type type, enum blitter_attrib_type type,
const union blitter_attrib *attrib); const union blitter_attrib *attrib);
@ -154,7 +154,8 @@ void util_blitter_set_texture_multisample(struct blitter_context *blitter,
/* The default function to draw a rectangle. This can only be used /* The default function to draw a rectangle. This can only be used
* inside of the draw_rectangle callback if the driver overrides it. */ * inside of the draw_rectangle callback if the driver overrides it. */
void util_blitter_draw_rectangle(struct blitter_context *blitter, void util_blitter_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, enum blitter_attrib_type type,
const union blitter_attrib *attrib); const union blitter_attrib *attrib);

2
src/gallium/drivers/r300/r300_context.h
View File

@ -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 r500_emit_index_bias(struct r300_context *r300, int index_bias);
void r300_blitter_draw_rectangle(struct blitter_context *blitter, void r300_blitter_draw_rectangle(struct blitter_context *blitter,
int x1, int y1, int x2, int y2, int x1, int y1, int x2, int y2,
float depth, float depth, unsigned num_instances,
enum blitter_attrib_type type, enum blitter_attrib_type type,
const union blitter_attrib *attrib); const union blitter_attrib *attrib);

8
src/gallium/drivers/r300/r300_render.c
View File

@ -1114,7 +1114,7 @@ struct draw_stage* r300_draw_stage(struct r300_context* r300)
* somewhat inefficient. Instead we use a rectangular point sprite. */ * somewhat inefficient. Instead we use a rectangular point sprite. */
void r300_blitter_draw_rectangle(struct blitter_context *blitter, void r300_blitter_draw_rectangle(struct blitter_context *blitter,
int x1, int y1, int x2, int y2, int x1, int y1, int x2, int y2,
float depth, float depth, unsigned num_instances,
enum blitter_attrib_type type, enum blitter_attrib_type type,
const union blitter_attrib *attrib) 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 /* XXX workaround for a lockup in MSAA resolve on SWTCL chipsets, this
* function most probably doesn't handle type=NONE correctly */ * function most probably doesn't handle type=NONE correctly */
if (!r300->screen->caps.has_tcl && type == UTIL_BLITTER_ATTRIB_NONE) { if ((!r300->screen->caps.has_tcl && type == UTIL_BLITTER_ATTRIB_NONE) ||
util_blitter_draw_rectangle(blitter, x1, y1, x2, y2, depth, type, attrib); num_instances > 1) {
util_blitter_draw_rectangle(blitter, x1, y1, x2, y2, depth,
num_instances, type, attrib);
return; return;
} }

13
src/gallium/drivers/radeon/r600_pipe_common.c
View File

@ -211,7 +211,8 @@ void r600_gfx_wait_fence(struct r600_common_context *ctx,
} }
void r600_draw_rectangle(struct blitter_context *blitter, 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, enum blitter_attrib_type type,
const union blitter_attrib *attrib) const union blitter_attrib *attrib)
{ {
@ -277,8 +278,14 @@ void r600_draw_rectangle(struct blitter_context *blitter,
} }
/* draw */ /* draw */
util_draw_vertex_buffer(&rctx->b, NULL, buf, blitter->vb_slot, offset, struct pipe_vertex_buffer vbuffer = {};
R600_PRIM_RECTANGLE_LIST, 3, 2); 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); pipe_resource_reference(&buf, NULL);
} }

3
src/gallium/drivers/radeon/r600_pipe_common.h
View File

@ -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, void r600_gfx_wait_fence(struct r600_common_context *ctx,
uint64_t va, uint32_t ref, uint32_t mask); uint64_t va, uint32_t ref, uint32_t mask);
void r600_draw_rectangle(struct blitter_context *blitter, 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, enum blitter_attrib_type type,
const union blitter_attrib *attrib); const union blitter_attrib *attrib);
bool r600_common_screen_init(struct r600_common_screen *rscreen, bool r600_common_screen_init(struct r600_common_screen *rscreen,