diff options
| author | Kristian H. Kristensen <[email protected]> | 2020-07-02 04:03:16 -0700 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-07-14 06:12:22 +0000 |
| commit | 416513d915ba55365b94937578f8bb8c207a3684 (patch) | |
| tree | e5157664a0cc713d779031ce8673fa5c8c2afcf0 /src/gallium | |
| parent | b36c675858f01c029e6cbee25340b6463d09a8b7 (diff) | |
freedreno/a6xx: Consolidate computing blit_cntl
Compute the blit_cntl value in one place and group it with the
register writes.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_blitter.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c index 93e460acce2..5207a26abfc 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c @@ -538,11 +538,7 @@ emit_blit_or_clear_texture(struct fd_context *ctx, struct fd_ringbuffer *ring, OUT_RING(ring, A6XX_GRAS_2D_DST_TL_X(dx1) | A6XX_GRAS_2D_DST_TL_Y(dy1)); OUT_RING(ring, A6XX_GRAS_2D_DST_BR_X(dx2) | A6XX_GRAS_2D_DST_BR_Y(dy2)); - uint32_t blit_cntl = blit_control(dfmt, util_format_is_srgb(info->dst.format)); - if (color) { - blit_cntl |= A6XX_RB_2D_BLIT_CNTL_SOLID_COLOR; - switch (info->dst.format) { case PIPE_FORMAT_Z24X8_UNORM: case PIPE_FORMAT_Z24_UNORM_S8_UINT: @@ -595,9 +591,13 @@ emit_blit_or_clear_texture(struct fd_context *ctx, struct fd_ringbuffer *ring, A6XX_GRAS_RESOLVE_CNTL_1_Y(info->scissor.miny)); OUT_RING(ring, A6XX_GRAS_RESOLVE_CNTL_1_X(info->scissor.maxx - 1) | A6XX_GRAS_RESOLVE_CNTL_1_Y(info->scissor.maxy - 1)); - blit_cntl |= A6XX_RB_2D_BLIT_CNTL_SCISSOR; } + uint32_t blit_cntl = + blit_control(dfmt, util_format_is_srgb(info->dst.format)) | + COND(color, A6XX_RB_2D_BLIT_CNTL_SOLID_COLOR) | + COND(info->scissor_enable, A6XX_RB_2D_BLIT_CNTL_SCISSOR); + OUT_PKT4(ring, REG_A6XX_RB_2D_BLIT_CNTL, 1); OUT_RING(ring, blit_cntl); |