On 6/19/19 11:03 AM, Bas Nieuwenhuizen wrote:
Actually, retract r-b, please fix the legacy accesses on gfx9+ too.
Yes, I will fix and send v2.
On Wed, Jun 19, 2019, 11:02 AM Bas Nieuwenhuizen <b...@basnieuwenhuizen.nl <mailto:b...@basnieuwenhuizen.nl>> wrote:R-b On Tue, Jun 18, 2019, 4:12 PM Samuel Pitoiset <samuel.pitoi...@gmail.com <mailto:samuel.pitoi...@gmail.com>> wrote: Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com <mailto:samuel.pitoi...@gmail.com>> --- src/amd/vulkan/radv_cmd_buffer.c | 40 +++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index a26bf6c6a67..ebeee2c3723 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -4912,11 +4912,49 @@ 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; - state->flush_bits |= radv_clear_dcc(cmd_buffer, image, range, value); + /* 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); + } + + /* When DCC is enabled with mipmaps, some levels might not support fast + * clears and we have to initialize them as "fully expanded". + */ + if (image->planes[0].surface.num_dcc_levels > 1) { + /* Compute the size of all fast clearable DCC levels. */ + for (unsigned i = 0; i < image->planes[0].surface.num_dcc_levels; i++) { + struct legacy_surf_level *surf_level = + &image->planes[0].surface.u.legacy.level[i]; + + if (!surf_level->dcc_fast_clear_size) + break; + + size = surf_level->dcc_offset + surf_level->dcc_fast_clear_size; + } + + /* Initialize the mipmap levels without DCC. */ + if (size != image->planes[0].surface.dcc_size) { + state->flush_bits |= + radv_fill_buffer(cmd_buffer, image->bo, + image->offset + image->dcc_offset + size, + image->planes[0].surface.dcc_size - size, + 0xffffffff); + } + } state->flush_bits |= RADV_CMD_FLAG_FLUSH_AND_INV_CB | RADV_CMD_FLAG_FLUSH_AND_INV_CB_META;-- 2.22.0_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org <mailto:mesa-dev@lists.freedesktop.org> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
