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

freedreno/a6xx: Move CP_SET_MARKER to setup helper

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5717>
This commit is contained in:
Kristian H. Kristensen
2020-07-03 15:18:01 -07:00
committed by Marge Bot
parent 3961fb7e28
commit 3ee89e6d03
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/drivers/freedreno/a6xx/fd6_blitter.c
View File

@@ -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) {