commit 83eb1f254a870e5ef25f6631ba962ec4d266f6e1
author Alejandro Piñeiro <apinheiro@igalia.com> Thu May 07 16:08:10 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Tue Oct 13 21:21:30 2020 +0000
tree 43e9a55dc906592912fd638425d31125229aed43
parent d3c6bd6e7ad0d7f298b96159a4c25deaad0fc38e

v3dv/meta-copy: ensure valid height/width with compressed formats

With compressed formats we compute the final height/width dividing by
the block sizes. On some cases the block sizes are bigger that the
original values, or it is not a exact division, so we need to round up
the division.

Fixes tests like:
dEQP-VK.texture.compressed.*

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>

src/broadcom/vulkan/v3dv_meta_copy.c

diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c
index 15fc4b2..5117ceb 100644
--- a/src/broadcom/vulkan/v3dv_meta_copy.c
+++ b/src/broadcom/vulkan/v3dv_meta_copy.c
@@ -575,8 +575,8 @@
       height = region->bufferImageHeight;
 
    /* Handle copy from compressed format */
-   width /= vk_format_get_blockwidth(image->vk_format);
-   height /= vk_format_get_blockheight(image->vk_format);
+   width = DIV_ROUND_UP(width, vk_format_get_blockwidth(image->vk_format));
+   height = DIV_ROUND_UP(height, vk_format_get_blockheight(image->vk_format));
 
    /* If we are storing stencil from a combined depth/stencil format the
     * Vulkan spec states that the output buffer must have packed stencil
@@ -665,8 +665,8 @@
    /* Handle copy from compressed format using a compatible format */
    const uint32_t block_w = vk_format_get_blockwidth(image->vk_format);
    const uint32_t block_h = vk_format_get_blockheight(image->vk_format);
-   const uint32_t width = region->imageExtent.width / block_w;
-   const uint32_t height = region->imageExtent.height / block_h;
+   const uint32_t width = DIV_ROUND_UP(region->imageExtent.width, block_w);
+   const uint32_t height = DIV_ROUND_UP(region->imageExtent.height, block_h);
 
    v3dv_job_start_frame(job, width, height, num_layers, 1, internal_bpp);
 
@@ -906,8 +906,8 @@
    /* Handle copy to compressed image using compatible format */
    const uint32_t block_w = vk_format_get_blockwidth(dst->vk_format);
    const uint32_t block_h = vk_format_get_blockheight(dst->vk_format);
-   const uint32_t width = region->extent.width / block_w;
-   const uint32_t height = region->extent.height / block_h;
+   const uint32_t width = DIV_ROUND_UP(region->extent.width, block_w);
+   const uint32_t height = DIV_ROUND_UP(region->extent.height, block_h);
 
    v3dv_job_start_frame(job, width, height, num_layers, 1, internal_bpp);
 
@@ -1022,8 +1022,8 @@
    const uint32_t dst_block_w = vk_format_get_blockwidth(dst->vk_format);
    const uint32_t dst_block_h = vk_format_get_blockheight(dst->vk_format);
    const VkOffset3D dst_start = {
-      region->dstOffset.x * src_block_w / dst_block_w / divisor,
-      region->dstOffset.y * src_block_h / dst_block_h,
+      DIV_ROUND_UP(region->dstOffset.x * src_block_w, dst_block_w) / divisor,
+      DIV_ROUND_UP(region->dstOffset.y * src_block_h, dst_block_h),
       region->dstOffset.z,
    };
    const VkOffset3D dst_end = {
@@ -1690,8 +1690,8 @@
       height = region->bufferImageHeight;
 
    /* Handle copy to compressed format using a compatible format */
-   width /= vk_format_get_blockwidth(image->vk_format);
-   height /= vk_format_get_blockheight(image->vk_format);
+   width = DIV_ROUND_UP(width, vk_format_get_blockwidth(image->vk_format));
+   height = DIV_ROUND_UP(height, vk_format_get_blockheight(image->vk_format));
 
    uint32_t cpp = imgrsc->aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT ?
                   1 : image->cpp;
@@ -1823,8 +1823,8 @@
    /* Handle copy to compressed format using a compatible format */
    const uint32_t block_w = vk_format_get_blockwidth(image->vk_format);
    const uint32_t block_h = vk_format_get_blockheight(image->vk_format);
-   const uint32_t width = region->imageExtent.width / block_w;
-   const uint32_t height = region->imageExtent.height / block_h;
+   const uint32_t width = DIV_ROUND_UP(region->imageExtent.width, block_w);
+   const uint32_t height = DIV_ROUND_UP(region->imageExtent.height, block_h);
 
    v3dv_job_start_frame(job, width, height, num_layers, 1, internal_bpp);
 
@@ -3157,10 +3157,10 @@
    const uint32_t src_block_w = vk_format_get_blockwidth(src->vk_format);
    const uint32_t src_block_h = vk_format_get_blockheight(src->vk_format);
    const uint32_t dst_level_w =
-      u_minify(dst->extent.width * src_block_w / dst_block_w,
+      u_minify(DIV_ROUND_UP(dst->extent.width * src_block_w, dst_block_w),
                region->dstSubresource.mipLevel);
    const uint32_t dst_level_h =
-      u_minify(dst->extent.height * src_block_h / dst_block_h,
+      u_minify(DIV_ROUND_UP(dst->extent.height * src_block_h, dst_block_h),
                region->dstSubresource.mipLevel);
 
    const uint32_t src_level_w =