Mesa (master): radv: remove useless checks in radv_set_{color, depth}_clear_regs()

Samuel Pitoiset hakzsam at kemper.freedesktop.org
Fri Dec 8 10:26:09 UTC 2017


Module: Mesa
Branch: master
Commit: d90b7a4c5073751221abff309a8de0705a625acc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d90b7a4c5073751221abff309a8de0705a625acc

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Dec  6 17:49:36 2017 +0100

radv: remove useless checks in radv_set_{color,depth}_clear_regs()

Already checked by the respective callers.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/radv_cmd_buffer.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 95c2915c97..621f0bad0b 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -1300,8 +1300,7 @@ radv_set_depth_clear_regs(struct radv_cmd_buffer *cmd_buffer,
 	va += image->offset + image->clear_value_offset;
 	unsigned reg_offset = 0, reg_count = 0;
 
-	if (!image->surface.htile_size)
-		return;
+	assert(image->surface.htile_size);
 
 	if (aspects & VK_IMAGE_ASPECT_STENCIL_BIT) {
 		++reg_count;
@@ -1400,8 +1399,7 @@ radv_set_color_clear_regs(struct radv_cmd_buffer *cmd_buffer,
 	uint64_t va = radv_buffer_get_va(image->bo);
 	va += image->offset + image->clear_value_offset;
 
-	if (!image->cmask.size && !image->surface.dcc_size)
-		return;
+	assert(image->cmask.size || image->surface.dcc_size);
 
 	radeon_emit(cmd_buffer->cs, PKT3(PKT3_WRITE_DATA, 4, 0));
 	radeon_emit(cmd_buffer->cs, S_370_DST_SEL(V_370_MEM_ASYNC) |




More information about the mesa-commit mailing list