[v2,3/6] radv: add radv_dcc_clear_level() helper

Submitted by Samuel Pitoiset on June 20, 2019, 7:17 a.m.

Details

Message ID 20190620071737.7736-3-samuel.pitoiset@gmail.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Samuel Pitoiset June 20, 2019, 7:17 a.m.
For clearing only one level.

v2: do not use the legacy stuff on GFX9+

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
---
 src/amd/vulkan/radv_meta.h       |  3 +++
 src/amd/vulkan/radv_meta_clear.c | 30 +++++++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/radv_meta.h
index 0cb31b9a7ec..5880064ff30 100644
--- a/src/amd/vulkan/radv_meta.h
+++ b/src/amd/vulkan/radv_meta.h
@@ -218,6 +218,9 @@  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);
diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c
index c43ed6eeef1..dea0cae6d96 100644
--- a/src/amd/vulkan/radv_meta_clear.c
+++ b/src/amd/vulkan/radv_meta_clear.c
@@ -1333,6 +1333,32 @@  radv_clear_fmask(struct radv_cmd_buffer *cmd_buffer,
 				image->fmask.size, value);
 }
 
+uint32_t
+radv_dcc_clear_level(struct radv_cmd_buffer *cmd_buffer,
+		     const struct radv_image *image,
+		     uint32_t level, uint32_t value)
+{
+	uint64_t offset = image->offset + image->dcc_offset;
+	uint32_t size;
+
+	if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9) {
+		/* Mipmap levels aren't implemented. */
+		assert(level == 0);
+		size = image->planes[0].surface.dcc_size;
+	} else {
+		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);
+
+		offset += surf_level->dcc_offset;
+		size = surf_level->dcc_fast_clear_size;
+	}
+
+	return radv_fill_buffer(cmd_buffer, image->bo, offset, size, value);
+}
+
 uint32_t
 radv_clear_dcc(struct radv_cmd_buffer *cmd_buffer,
 	       struct radv_image *image,
@@ -1341,9 +1367,7 @@  radv_clear_dcc(struct radv_cmd_buffer *cmd_buffer,
 	/* Mark the image as being compressed. */
 	radv_update_dcc_metadata(cmd_buffer, image, range, true);
 
-	return radv_fill_buffer(cmd_buffer, image->bo,
-				image->offset + image->dcc_offset,
-				image->planes[0].surface.dcc_size, value);
+	return radv_dcc_clear_level(cmd_buffer, image, 0, value);
 }
 
 uint32_t