Module: Mesa Branch: master Commit: 57d54bcf994f2b3a963f73775a3dd756e8d96be3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=57d54bcf994f2b3a963f73775a3dd756e8d96be3
Author: Eric Anholt <[email protected]> Date: Fri Mar 27 17:13:25 2020 -0700 freedreno: Rename "is_blit" to "is_discard_blit" It's about the special case of an overwrite of a level meaning we can discard old batch contents. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4356> --- src/gallium/drivers/freedreno/a3xx/fd3_draw.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_draw.c | 2 +- src/gallium/drivers/freedreno/freedreno_blitter.c | 4 ++-- src/gallium/drivers/freedreno/freedreno_context.h | 2 +- src/gallium/drivers/freedreno/freedreno_draw.c | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_draw.c b/src/gallium/drivers/freedreno/a3xx/fd3_draw.c index 94dbd008a7d..99e44db374c 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_draw.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_draw.c @@ -126,7 +126,7 @@ fd3_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info, .color_two_side = ctx->rasterizer->light_twoside, .vclamp_color = ctx->rasterizer->clamp_vertex_color, .fclamp_color = ctx->rasterizer->clamp_fragment_color, - .half_precision = ctx->in_blit && + .half_precision = ctx->in_discard_blit && fd_half_precision(&ctx->batch->framebuffer), .has_per_samp = (fd3_ctx->fsaturate || fd3_ctx->vsaturate), .vsaturate_s = fd3_ctx->vsaturate_s, diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_draw.c b/src/gallium/drivers/freedreno/a4xx/fd4_draw.c index a32aa75dec5..9c8ef830051 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_draw.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_draw.c @@ -111,7 +111,7 @@ fd4_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info, .vclamp_color = ctx->rasterizer->clamp_vertex_color, .fclamp_color = ctx->rasterizer->clamp_fragment_color, .rasterflat = ctx->rasterizer->flatshade, - .half_precision = ctx->in_blit && + .half_precision = ctx->in_discard_blit && fd_half_precision(&ctx->batch->framebuffer), .ucp_enables = ctx->rasterizer->clip_plane_enable, .has_per_samp = (fd4_ctx->fsaturate || fd4_ctx->vsaturate || diff --git a/src/gallium/drivers/freedreno/freedreno_blitter.c b/src/gallium/drivers/freedreno/freedreno_blitter.c index ca6cd8ebdcd..63906c3bba5 100644 --- a/src/gallium/drivers/freedreno/freedreno_blitter.c +++ b/src/gallium/drivers/freedreno/freedreno_blitter.c @@ -114,7 +114,7 @@ fd_blitter_pipe_begin(struct fd_context *ctx, bool render_cond, bool discard, if (ctx->batch) fd_batch_set_stage(ctx->batch, stage); - ctx->in_blit = discard; + ctx->in_discard_blit = discard; } static void @@ -122,7 +122,7 @@ fd_blitter_pipe_end(struct fd_context *ctx) { if (ctx->batch) fd_batch_set_stage(ctx->batch, FD_STAGE_NULL); - ctx->in_blit = false; + ctx->in_discard_blit = false; } bool diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h index 41f67a87d3c..e2edf15daa9 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.h +++ b/src/gallium/drivers/freedreno/freedreno_context.h @@ -263,7 +263,7 @@ struct fd_context { * contents. Main point is to eliminate blits from fd_try_shadow_resource(). * For example, in case of texture upload + gen-mipmaps. */ - bool in_blit : 1; + bool in_discard_blit : 1; struct pipe_scissor_state scissor; diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index cbbd82b7a23..e2f51a0c391 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -112,12 +112,12 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) } } - if (ctx->in_blit) { + if (ctx->in_discard_blit) { fd_batch_reset(batch); fd_context_all_dirty(ctx); } - batch->blit = ctx->in_blit; + batch->blit = ctx->in_discard_blit; batch->back_blit = ctx->in_shadow; /* NOTE: needs to be before resource_written(batch->query_buf), otherwise @@ -323,7 +323,7 @@ fd_clear(struct pipe_context *pctx, unsigned buffers, fd_fence_ref(&ctx->last_fence, NULL); - if (ctx->in_blit) { + if (ctx->in_discard_blit) { fd_batch_reset(batch); fd_context_all_dirty(ctx); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
