From 46f0e5b1e9310dda1a1ef959d34adf0d8c683eaf Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Wed, 7 Apr 2021 19:08:54 -0700 Subject: [PATCH] anv: Move assert in vkGetImageSubresourceLayout Assert the value is valid before we use it. Part-of: --- src/intel/vulkan/anv_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index cbe4fd3cc0d..2024451caca 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -1624,6 +1624,8 @@ void anv_GetImageSubresourceLayout( { ANV_FROM_HANDLE(anv_image, image, _image); + assert(__builtin_popcount(subresource->aspectMask) == 1); + const struct anv_surface *surface; if (subresource->aspectMask == VK_IMAGE_ASPECT_PLANE_1_BIT && image->drm_format_mod != DRM_FORMAT_MOD_INVALID && @@ -1640,8 +1642,6 @@ void anv_GetImageSubresourceLayout( surface = &image->planes[plane].primary_surface; } - assert(__builtin_popcount(subresource->aspectMask) == 1); - layout->offset = surface->memory_range.offset; layout->rowPitch = surface->isl.row_pitch_B; layout->depthPitch = isl_surf_get_array_pitch(&surface->isl);