From 2a8d1039b67d7bbf739e8031a123cc0f3f7ee1b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 21 Jun 2018 23:00:56 -0400 Subject: [PATCH] radeonsi: inline struct r600_cmask_info Reviewed-by: Timothy Arceri --- src/gallium/drivers/radeonsi/si_blit.c | 8 ++--- src/gallium/drivers/radeonsi/si_clear.c | 14 ++++---- src/gallium/drivers/radeonsi/si_descriptors.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.h | 10 ++---- src/gallium/drivers/radeonsi/si_state.c | 2 +- src/gallium/drivers/radeonsi/si_texture.c | 48 ++++++++++++++------------- 6 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 7cb8191..0ab1356 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -538,7 +538,7 @@ si_decompress_color_texture(struct si_context *sctx, struct si_texture *tex, unsigned first_level, unsigned last_level) { /* CMASK or DCC can be discarded and we can still end up here. */ - if (!tex->cmask.size && !tex->surface.fmask_size && !tex->dcc_offset) + if (!tex->cmask_size && !tex->surface.fmask_size && !tex->dcc_offset) return; si_blit_decompress_color(sctx, tex, first_level, last_level, 0, @@ -859,7 +859,7 @@ static void si_decompress_subresource(struct pipe_context *ctx, si_decompress_depth(sctx, stex, planes, level, level, first_layer, last_layer); - } else if (stex->surface.fmask_size || stex->cmask.size || stex->dcc_offset) { + } else if (stex->surface.fmask_size || stex->cmask_size || stex->dcc_offset) { /* If we've rendered into the framebuffer and it's a blitting * source, make sure the decompression pass is invoked * by dirtying the framebuffer. @@ -1139,7 +1139,7 @@ static bool do_hardware_msaa_resolve(struct pipe_context *ctx, info->src.box.height == dst_height && info->src.box.depth == 1 && !dst->surface.is_linear && - (!dst->cmask.size || !dst->dirty_level_mask)) { /* dst cannot be fast-cleared */ + (!dst->cmask_size || !dst->dirty_level_mask)) { /* dst cannot be fast-cleared */ /* Check the last constraint. */ if (src->surface.micro_tile_mode != dst->surface.micro_tile_mode) { /* The next fast clear will switch to this mode to @@ -1325,7 +1325,7 @@ static void si_flush_resource(struct pipe_context *ctx, if (tex->dcc_separate_buffer && !tex->separate_dcc_dirty) return; - if (!tex->is_depth && (tex->cmask.size || tex->dcc_offset)) { + if (!tex->is_depth && (tex->cmask_size || tex->dcc_offset)) { si_blit_decompress_color(sctx, tex, 0, res->last_level, 0, util_max_layer(res, 0), tex->dcc_separate_buffer != NULL); diff --git a/src/gallium/drivers/radeonsi/si_clear.c b/src/gallium/drivers/radeonsi/si_clear.c index 2054e75..83bb51a 100644 --- a/src/gallium/drivers/radeonsi/si_clear.c +++ b/src/gallium/drivers/radeonsi/si_clear.c @@ -40,7 +40,7 @@ static void si_alloc_separate_cmask(struct si_screen *sscreen, if (tex->cmask_buffer) return; - assert(tex->cmask.size == 0); + assert(tex->cmask_size == 0); if (!tex->surface.cmask_size) return; @@ -54,8 +54,8 @@ static void si_alloc_separate_cmask(struct si_screen *sscreen, if (tex->cmask_buffer == NULL) return; - tex->cmask.size = tex->surface.cmask_size; - tex->cmask.base_address_reg = tex->cmask_buffer->gpu_address >> 8; + tex->cmask_size = tex->surface.cmask_size; + tex->cmask_base_address_reg = tex->cmask_buffer->gpu_address >> 8; tex->cb_color_info |= S_028C70_FAST_CLEAR(1); p_atomic_inc(&sscreen->compressed_colortex_counter); @@ -490,13 +490,13 @@ static void si_do_fast_color_clear(struct si_context *sctx, continue; /* DCC fast clear with MSAA should clear CMASK to 0xC. */ - if (tex->buffer.b.b.nr_samples >= 2 && tex->cmask.size) { + if (tex->buffer.b.b.nr_samples >= 2 && tex->cmask_size) { /* TODO: This doesn't work with MSAA. */ if (eliminate_needed) continue; si_clear_buffer(sctx, &tex->cmask_buffer->b.b, - tex->cmask.offset, tex->cmask.size, + tex->cmask_offset, tex->cmask_size, 0xCCCCCCCC, SI_COHERENCY_CB_META); need_decompress_pass = true; } @@ -522,13 +522,13 @@ static void si_do_fast_color_clear(struct si_context *sctx, /* ensure CMASK is enabled */ si_alloc_separate_cmask(sctx->screen, tex); - if (tex->cmask.size == 0) { + if (tex->cmask_size == 0) { continue; } /* Do the fast clear. */ si_clear_buffer(sctx, &tex->cmask_buffer->b.b, - tex->cmask.offset, tex->cmask.size, 0, + tex->cmask_offset, tex->cmask_size, 0, SI_COHERENCY_CB_META); need_decompress_pass = true; } diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 9de0112..68b58fd 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -478,7 +478,7 @@ static bool color_needs_decompression(struct si_texture *tex) { return tex->surface.fmask_size || (tex->dirty_level_mask && - (tex->cmask.size || tex->dcc_offset)); + (tex->cmask_size || tex->dcc_offset)); } static bool depth_needs_decompression(struct si_texture *tex) diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index b6ef60c..7ec547d 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -230,12 +230,6 @@ struct r600_transfer { unsigned offset; }; -struct r600_cmask_info { - uint64_t offset; - uint64_t base_address_reg; - uint32_t size; -}; - struct si_texture { struct r600_resource buffer; @@ -245,7 +239,9 @@ struct si_texture { /* Colorbuffer compression and fast clear. */ uint64_t fmask_offset; - struct r600_cmask_info cmask; + uint64_t cmask_offset; + uint64_t cmask_base_address_reg; + uint32_t cmask_size; struct r600_resource *cmask_buffer; uint64_t dcc_offset; /* 0 = disabled */ unsigned cb_color_info; /* fast clear enable bit */ diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index cb05de2..a27b244 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -3012,7 +3012,7 @@ static void si_emit_framebuffer_state(struct si_context *sctx) /* Compute mutable surface parameters. */ cb_color_base = tex->buffer.gpu_address >> 8; cb_color_fmask = 0; - cb_color_cmask = tex->cmask.base_address_reg; + cb_color_cmask = tex->cmask_base_address_reg; cb_dcc_base = 0; cb_color_info = cb->cb_color_info | tex->cb_color_info; cb_color_attrib = cb->cb_color_attrib; diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index 96104bc..f7a56c1 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -82,7 +82,7 @@ bool si_prepare_for_dma_blit(struct si_context *sctx, * dst: If overwriting the whole texture, discard CMASK and use * SDMA. Otherwise, use the 3D path. */ - if (dst->cmask.size && dst->dirty_level_mask & (1 << dst_level)) { + if (dst->cmask_size && dst->dirty_level_mask & (1 << dst_level)) { /* The CMASK clear is only enabled for the first level. */ assert(dst_level == 0); if (!util_texrange_covers_whole_level(&dst->buffer.b.b, dst_level, @@ -94,7 +94,7 @@ bool si_prepare_for_dma_blit(struct si_context *sctx, } /* All requirements are met. Prepare textures for SDMA. */ - if (src->cmask.size && src->dirty_level_mask & (1 << src_level)) + if (src->cmask_size && src->dirty_level_mask & (1 << src_level)) sctx->b.flush_resource(&sctx->b, &src->buffer.b.b); assert(!(src->dirty_level_mask & (1 << src_level))); @@ -420,14 +420,14 @@ void si_eliminate_fast_color_clear(struct si_context *sctx, void si_texture_discard_cmask(struct si_screen *sscreen, struct si_texture *tex) { - if (!tex->cmask.size) + if (!tex->cmask_size) return; assert(tex->buffer.b.b.nr_samples <= 1); /* Disable CMASK. */ - memset(&tex->cmask, 0, sizeof(tex->cmask)); - tex->cmask.base_address_reg = tex->buffer.gpu_address >> 8; + tex->cmask_size = 0; + tex->cmask_base_address_reg = tex->buffer.gpu_address >> 8; tex->dirty_level_mask = 0; tex->cb_color_info &= ~S_028C70_FAST_CLEAR(1); @@ -571,7 +571,9 @@ static void si_reallocate_texture_inplace(struct si_context *sctx, new_tex->flushed_depth_texture); tex->fmask_offset = new_tex->fmask_offset; - tex->cmask = new_tex->cmask; + tex->cmask_offset = new_tex->cmask_offset; + tex->cmask_size = new_tex->cmask_size; + tex->cmask_base_address_reg = new_tex->cmask_base_address_reg; r600_resource_reference(&tex->cmask_buffer, new_tex->cmask_buffer); tex->dcc_offset = new_tex->dcc_offset; tex->cb_color_info = new_tex->cb_color_info; @@ -602,7 +604,7 @@ static void si_reallocate_texture_inplace(struct si_context *sctx, if (new_bind_flag == PIPE_BIND_LINEAR) { assert(!tex->htile_offset); - assert(!tex->cmask.size); + assert(!tex->cmask_size); assert(!tex->surface.fmask_size); assert(!tex->dcc_offset); assert(!tex->is_depth); @@ -761,7 +763,7 @@ static boolean si_texture_get_handle(struct pipe_screen* screen, } if (!(usage & PIPE_HANDLE_USAGE_EXPLICIT_FLUSH) && - (tex->cmask.size || tex->dcc_offset)) { + (tex->cmask_size || tex->dcc_offset)) { /* Eliminate fast clear (both CMASK and DCC) */ si_eliminate_fast_color_clear(sctx, tex); /* eliminate_fast_color_clear flushes the context */ @@ -770,7 +772,7 @@ static boolean si_texture_get_handle(struct pipe_screen* screen, /* Disable CMASK if flush_resource isn't going * to be called. */ - if (tex->cmask.size) + if (tex->cmask_size) si_texture_discard_cmask(sscreen, tex); } @@ -984,10 +986,10 @@ void si_print_texture_info(struct si_screen *sscreen, tex->surface.u.gfx9.fmask.epitch); } - if (tex->cmask.size) { + if (tex->cmask_size) { u_log_printf(log, " CMask: offset=%"PRIu64", size=%u, " "alignment=%u, rb_aligned=%u, pipe_aligned=%u\n", - tex->cmask.offset, + tex->cmask_offset, tex->surface.cmask_size, tex->surface.cmask_alignment, tex->surface.u.gfx9.cmask.rb_aligned, @@ -1038,10 +1040,10 @@ void si_print_texture_info(struct si_screen *sscreen, tex->surface.u.legacy.fmask.slice_tile_max, tex->surface.u.legacy.fmask.tiling_index); - if (tex->cmask.size) + if (tex->cmask_size) u_log_printf(log, " CMask: offset=%"PRIu64", size=%u, alignment=%u, " "slice_tile_max=%u\n", - tex->cmask.offset, tex->cmask.size, tex->surface.cmask_alignment, + tex->cmask_offset, tex->cmask_size, tex->surface.cmask_alignment, tex->surface.u.legacy.cmask_slice_tile_max); if (tex->htile_offset) @@ -1183,13 +1185,13 @@ si_texture_create_object(struct pipe_screen *screen, tex->size = tex->fmask_offset + tex->surface.fmask_size; /* Allocate CMASK. */ - tex->cmask.size = tex->surface.cmask_size; - tex->cmask.offset = align64(tex->size, tex->surface.cmask_alignment); - tex->size = tex->cmask.offset + tex->cmask.size; + tex->cmask_size = tex->surface.cmask_size; + tex->cmask_offset = align64(tex->size, tex->surface.cmask_alignment); + tex->size = tex->cmask_offset + tex->cmask_size; tex->cb_color_info |= S_028C70_FAST_CLEAR(1); tex->cmask_buffer = &tex->buffer; - if (!tex->surface.fmask_size || !tex->cmask.size) { + if (!tex->surface.fmask_size || !tex->cmask_size) { FREE(tex); return NULL; } @@ -1229,10 +1231,10 @@ si_texture_create_object(struct pipe_screen *screen, resource->gart_usage = buf->size; } - if (tex->cmask.size) { + if (tex->cmask_size) { /* Initialize the cmask to 0xCC (= compressed state). */ si_screen_clear_buffer(sscreen, &tex->cmask_buffer->b.b, - tex->cmask.offset, tex->cmask.size, + tex->cmask_offset, tex->cmask_size, 0xCCCCCCCC); } if (tex->htile_offset) { @@ -1256,8 +1258,8 @@ si_texture_create_object(struct pipe_screen *screen, } /* Initialize the CMASK base register value. */ - tex->cmask.base_address_reg = - (tex->buffer.gpu_address + tex->cmask.offset) >> 8; + tex->cmask_base_address_reg = + (tex->buffer.gpu_address + tex->cmask_offset) >> 8; if (sscreen->debug_flags & DBG(VM)) { fprintf(stderr, "VM start=0x%"PRIX64" end=0x%"PRIX64" | Texture %ix%ix%i, %i levels, %i samples, %s\n", @@ -1622,8 +1624,8 @@ static void si_texture_invalidate_storage(struct si_context *sctx, si_alloc_resource(sscreen, &tex->buffer); /* Initialize the CMASK base address (needed even without CMASK). */ - tex->cmask.base_address_reg = - (tex->buffer.gpu_address + tex->cmask.offset) >> 8; + tex->cmask_base_address_reg = + (tex->buffer.gpu_address + tex->cmask_offset) >> 8; p_atomic_inc(&sscreen->dirty_tex_counter); -- 2.7.4