fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 18:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: make sure to mark the image as compressed when clearing DCC levels

Browse source 
Found while working on DCC for arrays.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset 2019-06-27 15:06:15 +02:00
parent 3fd21a6b77
commit cc50c85e13
3 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -4952,32 +4952,14 @@ void radv_initialize_dcc(struct radv_cmd_buffer *cmd_buffer,
const VkImageSubresourceRange *range, uint32_t value)
{
struct radv_cmd_state *state = &cmd_buffer->state;
uint32_t level_count = radv_get_levelCount(image, range);
unsigned size = 0;
state->flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_CB |
RADV_CMD_FLAG_FLUSH_AND_INV_CB_META;
if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9) {
/* Mipmap level aren't implemented. */
assert(level_count == 1);
state->flush_bits |= radv_clear_dcc(cmd_buffer, image,
range, value);
} else {
/* Initialize the mipmap levels with DCC first. */
for (unsigned l = 0; l < level_count; l++) {
uint32_t level = range->baseMipLevel + l;
struct legacy_surf_level *surf_level =
&image->planes[0].surface.u.legacy.level[level];
if (!surf_level->dcc_fast_clear_size)
break;
state->flush_bits |=
radv_dcc_clear_level(cmd_buffer, image,
level, value);
}
state->flush_bits |= radv_clear_dcc(cmd_buffer, image, range, value);
if (cmd_buffer->device->physical_device->rad_info.chip_class == GFX8) {
/* When DCC is enabled with mipmaps, some levels might not
* support fast clears and we have to initialize them as "fully
* expanded".

3
src/amd/vulkan/radv_meta.h
View file

@ -220,9 +220,6 @@ uint32_t radv_clear_fmask(struct radv_cmd_buffer *cmd_buffer,
uint32_t radv_clear_dcc(struct radv_cmd_buffer *cmd_buffer,
struct radv_image *image,
const VkImageSubresourceRange *range, uint32_t value);
uint32_t radv_dcc_clear_level(struct radv_cmd_buffer *cmd_buffer,
const struct radv_image *image,
uint32_t level, uint32_t value);
uint32_t radv_clear_htile(struct radv_cmd_buffer *cmd_buffer,
struct radv_image *image,
const VkImageSubresourceRange *range, uint32_t value);

10
src/amd/vulkan/radv_meta_clear.c
View file

@ -1367,7 +1367,7 @@ radv_clear_fmask(struct radv_cmd_buffer *cmd_buffer,
return radv_fill_buffer(cmd_buffer, image->bo, offset, size, value);
}
uint32_t
static uint32_t
radv_dcc_clear_level(struct radv_cmd_buffer *cmd_buffer,
const struct radv_image *image,
uint32_t level, uint32_t value)
@ -1383,9 +1383,11 @@ radv_dcc_clear_level(struct radv_cmd_buffer *cmd_buffer,
const struct legacy_surf_level *surf_level =
&image->planes[0].surface.u.legacy.level[level];
/* If this is 0, fast clear isn't possible. */
assert(surf_level->dcc_fast_clear_size);
/* If dcc_fast_clear_size is 0 (which might happens for
* mipmaps) the fill buffer operation below is a no-op. This
* can only happen during initialization as the fast clear path
* fallbacks to slow clears if one level can't be fast cleared.
*/
offset += surf_level->dcc_offset;
size = surf_level->dcc_fast_clear_size;
}