From 6916ee7e1790ecfb0cef5e20507032d6186de569 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 7 Nov 2017 18:42:53 +0100 Subject: [PATCH] radeonsi: remove r600_texture::non_disp_tiling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeon/r600_pipe_common.h | 2 -- src/gallium/drivers/radeon/r600_texture.c | 7 ------- 2 files changed, 9 deletions(-) diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index b09acac0dfc..b595d920fe9 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -263,8 +263,6 @@ struct r600_texture { uint8_t stencil_clear_value; bool upgraded_depth; /* upgraded from unorm to Z32_FLOAT */ - bool non_disp_tiling; /* R600-Cayman only */ - /* Whether the texture is a displayable back buffer and needs DCC * decompression, which is expensive. Therefore, it's enabled only * if statistics suggest that it will pay off and it's allocated diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index 258690cadf5..bdc722ae0e1 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -553,7 +553,6 @@ static void r600_reallocate_texture_inplace(struct r600_common_context *rctx, rtex->tc_compatible_htile = new_tex->tc_compatible_htile; rtex->depth_cleared = new_tex->depth_cleared; rtex->stencil_cleared = new_tex->stencil_cleared; - rtex->non_disp_tiling = new_tex->non_disp_tiling; rtex->dcc_gather_statistics = new_tex->dcc_gather_statistics; rtex->framebuffers_bound = new_tex->framebuffers_bound; @@ -1155,10 +1154,6 @@ r600_texture_create_object(struct pipe_screen *screen, rtex->db_render_format = base->format; } - /* Tiled depth textures utilize the non-displayable tile order. - * This must be done after r600_setup_surface. - * Applies to R600-Cayman. */ - rtex->non_disp_tiling = rtex->is_depth && rtex->surface.u.legacy.level[0].mode >= RADEON_SURF_MODE_1D; /* Applies to GCN. */ rtex->last_msaa_resolve_target_micro_mode = rtex->surface.micro_tile_mode; @@ -1491,8 +1486,6 @@ bool si_init_flushed_depth_texture(struct pipe_context *ctx, R600_ERR("failed to create temporary texture to hold flushed depth\n"); return false; } - - (*flushed_depth_texture)->non_disp_tiling = false; return true; } -- 2.30.2