diff options
| author | Kristian H. Kristensen <[email protected]> | 2020-07-03 15:18:01 -0700 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-07-14 06:12:22 +0000 |
| commit | 3ee89e6d03bd108d33648e68aeb88b2989f16efa (patch) | |
| tree | 86924a2570358b8343e6b62cdf2e7ee884c9337d | |
| parent | 3961fb7e28b26dd16ea8155119810552bbd878ed (diff) | |
freedreno/a6xx: Move CP_SET_MARKER to setup helper
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
| -rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_blitter.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c index 24e3f7225bc..4aa6b946d42 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blitter.c @@ -240,6 +240,9 @@ emit_blit_setup(struct fd_ringbuffer *ring, bool is_srgb = util_format_is_srgb(pfmt); enum a6xx_2d_ifmt ifmt = fd6_ifmt(fmt); + OUT_PKT7(ring, CP_SET_MARKER, 1); + OUT_RING(ring, A6XX_CP_SET_MARKER_0_MODE(RM6_BLIT2DSCALE)); + if (is_srgb) { assert(ifmt == R2D_UNORM8); ifmt = R2D_UNORM8_SRGB; @@ -338,9 +341,6 @@ emit_blit_buffer(struct fd_context *ctx, struct fd_ringbuffer *ring, sshift = sbox->x & 0x3f; dshift = dbox->x & 0x3f; - OUT_PKT7(ring, CP_SET_MARKER, 1); - OUT_RING(ring, A6XX_CP_SET_MARKER_0_MODE(RM6_BLIT2DSCALE)); - emit_blit_setup(ring, PIPE_FORMAT_R8_UNORM, false, NULL); for (unsigned off = 0; off < sbox->width; off += (0x4000 - 0x40)) { @@ -536,9 +536,6 @@ emit_blit_or_clear_texture(struct fd_context *ctx, struct fd_ringbuffer *ring, dfmt = fd6_pipe2color(info->dst.format); - OUT_PKT7(ring, CP_SET_MARKER, 1); - OUT_RING(ring, A6XX_CP_SET_MARKER_0_MODE(RM6_BLIT2DSCALE)); - uint32_t nr_samples = fd_resource_nr_samples(&dst->base); if (!color) { |