On Sat, Oct 24, 2015 at 11:13 PM, Nicolai Hähnle <nhaeh...@gmail.com> wrote: > On 24.10.2015 17:49, Marek Olšák wrote: >> >> From: Marek Olšák <marek.ol...@amd.com> >> >> --- >> src/gallium/drivers/radeon/r600_texture.c | 2 +- >> src/gallium/drivers/radeonsi/cik_sdma.c | 2 +- >> src/gallium/drivers/radeonsi/si_blit.c | 6 +++--- >> src/gallium/drivers/radeonsi/si_dma.c | 2 +- >> src/gallium/drivers/radeonsi/si_state.c | 4 ++-- >> 5 files changed, 8 insertions(+), 8 deletions(-) >> >> diff --git a/src/gallium/drivers/radeon/r600_texture.c >> b/src/gallium/drivers/radeon/r600_texture.c >> index f7a11a2..40075ae 100644 >> --- a/src/gallium/drivers/radeon/r600_texture.c >> +++ b/src/gallium/drivers/radeon/r600_texture.c >> @@ -1367,7 +1367,7 @@ void evergreen_do_fast_color_clear(struct >> r600_common_context *rctx, >> continue; >> } >> >> - if (tex->surface.dcc_enabled) { >> + if (tex->dcc_buffer) { >> uint32_t reset_value; >> bool clear_words_needed; >> >> diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c >> b/src/gallium/drivers/radeonsi/cik_sdma.c >> index 25fd09a..e53af1d 100644 >> --- a/src/gallium/drivers/radeonsi/cik_sdma.c >> +++ b/src/gallium/drivers/radeonsi/cik_sdma.c >> @@ -243,7 +243,7 @@ void cik_sdma_copy(struct pipe_context *ctx, >> if (src->format != dst->format || >> rdst->surface.nsamples > 1 || rsrc->surface.nsamples > 1 || >> (rdst->dirty_level_mask | rdst->stencil_dirty_level_mask) & (1 >> << dst_level) || >> - rdst->surface.dcc_enabled || rsrc->surface.dcc_enabled) { >> + rdst->dcc_buffer || rsrc->dcc_buffer) { >> goto fallback; >> } >> >> diff --git a/src/gallium/drivers/radeonsi/si_blit.c >> b/src/gallium/drivers/radeonsi/si_blit.c >> index a226436..302b75c 100644 >> --- a/src/gallium/drivers/radeonsi/si_blit.c >> +++ b/src/gallium/drivers/radeonsi/si_blit.c >> @@ -326,7 +326,7 @@ void si_decompress_color_textures(struct si_context >> *sctx, >> assert(view); >> >> tex = (struct r600_texture *)view->texture; >> - assert(tex->cmask.size || tex->fmask.size || >> tex->surface.dcc_enabled); >> + assert(tex->cmask.size || tex->fmask.size || >> tex->dcc_buffer); >> >> si_blit_decompress_color(&sctx->b.b, tex, >> view->u.tex.first_level, >> view->u.tex.last_level, >> @@ -455,7 +455,7 @@ static void si_decompress_subresource(struct >> pipe_context *ctx, >> si_blit_decompress_depth_in_place(sctx, rtex, >> true, >> level, level, >> first_layer, >> last_layer); >> - } else if (rtex->fmask.size || rtex->cmask.size || >> rtex->surface.dcc_enabled) { >> + } else if (rtex->fmask.size || rtex->cmask.size || >> rtex->dcc_buffer) { >> si_blit_decompress_color(ctx, rtex, level, level, >> first_layer, last_layer); >> } >> @@ -676,7 +676,7 @@ static bool do_hardware_msaa_resolve(struct >> pipe_context *ctx, >> dst->surface.level[info->dst.level].mode >= >> RADEON_SURF_MODE_1D && >> !(dst->surface.flags & RADEON_SURF_SCANOUT) && >> (!dst->cmask.size || !dst->dirty_level_mask) && /* dst cannot >> be fast-cleared */ >> - !dst->surface.dcc_enabled) { >> + !dst->dcc_buffer) { >> si_blitter_begin(ctx, SI_COLOR_RESOLVE | >> (info->render_condition_enable ? 0 : >> SI_DISABLE_RENDER_COND)); >> util_blitter_custom_resolve_color(sctx->blitter, >> diff --git a/src/gallium/drivers/radeonsi/si_dma.c >> b/src/gallium/drivers/radeonsi/si_dma.c >> index 73c026c..581e89f 100644 >> --- a/src/gallium/drivers/radeonsi/si_dma.c >> +++ b/src/gallium/drivers/radeonsi/si_dma.c >> @@ -249,7 +249,7 @@ void si_dma_copy(struct pipe_context *ctx, >> (rdst->dirty_level_mask | rdst->stencil_dirty_level_mask) & (1 >> << dst_level) || >> rdst->cmask.size || rdst->fmask.size || >> rsrc->cmask.size || rsrc->fmask.size || >> - rdst->surface.dcc_enabled || rsrc->surface.dcc_enabled) { >> + rdst->dcc_buffer || rsrc->dcc_buffer) { >> goto fallback; >> } >> >> diff --git a/src/gallium/drivers/radeonsi/si_state.c >> b/src/gallium/drivers/radeonsi/si_state.c >> index c87f661..18b6405 100644 >> --- a/src/gallium/drivers/radeonsi/si_state.c >> +++ b/src/gallium/drivers/radeonsi/si_state.c >> @@ -1926,7 +1926,7 @@ static void si_initialize_color_surface(struct >> si_context *sctx, >> surf->cb_color_info = color_info; >> surf->cb_color_attrib = color_attrib; >> >> - if (sctx->b.chip_class >= VI && rtex->surface.dcc_enabled) { >> + if (sctx->b.chip_class >= VI && rtex->dcc_buffer) { >> unsigned max_uncompressed_block_size = 2; >> uint64_t dcc_offset = >> rtex->surface.level[level].dcc_offset; >> >> @@ -2655,7 +2655,7 @@ si_create_sampler_view_custom(struct pipe_context >> *ctx, >> view->state[5] = (S_008F24_BASE_ARRAY(state->u.tex.first_layer) | >> S_008F24_LAST_ARRAY(last_layer)); >> >> - if (tmp->surface.dcc_enabled) { >> + if (tmp->dcc_buffer) { >> uint64_t dcc_offset = surflevel[base_level].dcc_offset; >> unsigned swap = r600_translate_colorswap(pipe_format); >> >> > > This seems like a mistake that is very easy to repeat in the future. Can you > add a short comment to radeon_surf explaining why dcc_enabled should not be > used for these checks?
Sure. Marek _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev