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

radeonsi: rename DCC_WRITE -> ALLOW_DCC_STORE 

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12449>
This commit is contained in:
Marek Olšák 2021-08-17 18:58:20 -04:00 committed by Marge Bot
parent 550f859c53
commit 8c845d4cb4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/radeonsi/si_compute_blit.c
View File

@ -515,7 +515,7 @@ void si_compute_copy_image(struct si_context *sctx, struct pipe_resource *dst, u
if (is_dcc_decompress)
image[1].access |= SI_IMAGE_ACCESS_DCC_OFF;
else if (sctx->chip_class >= GFX10)
image[1].access |= SI_IMAGE_ACCESS_DCC_WRITE;
image[1].access |= SI_IMAGE_ACCESS_ALLOW_DCC_STORE;
ctx->set_shader_images(ctx, PIPE_SHADER_COMPUTE, 0, 2, 0, image);
@ -815,7 +815,7 @@ void si_compute_clear_render_target(struct pipe_context *ctx, struct pipe_surfac
struct pipe_image_view image = {0};
image.resource = dstsurf->texture;
image.shader_access = image.access = PIPE_IMAGE_ACCESS_WRITE | SI_IMAGE_ACCESS_DCC_WRITE;
image.shader_access = image.access = PIPE_IMAGE_ACCESS_WRITE | SI_IMAGE_ACCESS_ALLOW_DCC_STORE;
image.format = util_format_linear(dstsurf->format);
image.u.tex.level = dstsurf->u.tex.level;
image.u.tex.first_layer = 0; /* 3D images ignore first_layer (BASE_ARRAY) */

4
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@ -363,7 +363,7 @@ void si_set_mutable_tex_desc_fields(struct si_screen *sscreen, struct si_texture
/* DCC image stores require INDEPENDENT_128B_BLOCKS, which is not set
* with displayable DCC on Navi12-14 due to DCN limitations. */
S_00A018_WRITE_COMPRESS_ENABLE(tex->surface.u.gfx9.color.dcc.independent_128B_blocks &&
access & SI_IMAGE_ACCESS_DCC_WRITE);
access & SI_IMAGE_ACCESS_ALLOW_DCC_STORE);
}
state[7] = meta_va >> 16;
@ -746,7 +746,7 @@ static void si_set_shader_image_desc(struct si_context *ctx, const struct pipe_i
if (uses_dcc && !skip_decompress &&
!(access & SI_IMAGE_ACCESS_DCC_OFF) &&
((!(access & SI_IMAGE_ACCESS_DCC_WRITE) && (access & PIPE_IMAGE_ACCESS_WRITE)) ||
((!(access & SI_IMAGE_ACCESS_ALLOW_DCC_STORE) && (access & PIPE_IMAGE_ACCESS_WRITE)) ||
!vi_dcc_formats_compatible(screen, res->b.b.format, view->format))) {
/* If DCC can't be disabled, at least decompress it.
* The decompression is relatively cheap if the surface

4
src/gallium/drivers/radeonsi/si_pipe.h
View File

@ -170,8 +170,8 @@ enum si_clear_code
DCC_UNCOMPRESSED = 0xFFFFFFFF,
};
#define SI_IMAGE_ACCESS_DCC_OFF (1 << 8)
#define SI_IMAGE_ACCESS_DCC_WRITE (1 << 9)
#define SI_IMAGE_ACCESS_DCC_OFF (1 << 8)
#define SI_IMAGE_ACCESS_ALLOW_DCC_STORE (1 << 9)
/* Debug flags. */
enum