On 02/05/17 10:22, Dave Airlie wrote:
From: Dave Airlie <airl...@redhat.com>
This just makes it easier to do the follow in cleanups of the surface.
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/amd/vulkan/radv_meta_clear.c | 4 ++--
src/amd/vulkan/radv_private.h | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c
index 3e79cd8..d72f4c8 100644
--- a/src/amd/vulkan/radv_meta_clear.c
+++ b/src/amd/vulkan/radv_meta_clear.c
@@ -614,7 +614,7 @@ static bool depth_view_can_fast_clear(const struct
radv_image_view *iview,
iview->base_mip == 0 &&
iview->base_layer == 0 &&
radv_layout_can_expclear(iview->image, layout) &&
- memcmp(&iview->extent, &iview->image->extent,
sizeof(iview->extent)) == 0)
+ !radv_image_extent_compare(iview->image, &iview->extent))
return true;
return false;
}
@@ -858,7 +858,7 @@ emit_fast_color_clear(struct radv_cmd_buffer *cmd_buffer,
if (iview->image->surface.level[0].mode < RADEON_SURF_MODE_1D)
goto fail;
- if (memcmp(&iview->extent, &iview->image->extent, sizeof(iview->extent)))
+ if (!radv_image_extent_compare(iview->image, &iview->extent))
goto fail;
if (clear_rect->rect.offset.x || clear_rect->rect.offset.y ||
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 045bb64..48d0f44 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1284,6 +1284,15 @@ radv_sanitize_image_offset(const VkImageType imageType,
}
}
+static inline bool
+radv_image_extent_compare(const struct radv_image *image,
+ const VkExtent3D *extent)
Why not just pass const struct radv_image_view *iview here?
Either way:
Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com>
+{
+ if (memcmp(extent, &image->extent, sizeof(*extent)))
+ return false;
+ return true;
+}
+
struct radv_sampler {
uint32_t state[4];
};
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
