From d63acce5f43b6feb8ae81d62f5c2d6976384d81c Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Fri, 27 Mar 2020 12:02:59 +0100 Subject: [PATCH] tu: Return the correct alignment for images The alignment field was never initialized, so we were just returning an alignment of 0. Return the alignment from fdl, and while we're here cleanup some leftovers in tu_private.h. Tested-by: Marge Bot Part-of: --- src/freedreno/vulkan/tu_device.c | 2 +- src/freedreno/vulkan/tu_private.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index 75699e52706..0f72ddf0bed 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -1703,7 +1703,7 @@ tu_GetImageMemoryRequirements(VkDevice _device, pMemoryRequirements->memoryTypeBits = 1; pMemoryRequirements->size = image->layout.size; - pMemoryRequirements->alignment = image->alignment; + pMemoryRequirements->alignment = image->layout.base_align; } void diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 6a7dea85ab8..bc96ebb6d21 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -1339,13 +1339,6 @@ tu_2d_clear_zs(const VkClearDepthStencilValue *val, VkFormat format, uint32_t bu enum a6xx_2d_ifmt tu6_fmt_to_ifmt(enum a6xx_format fmt); enum a6xx_depth_format tu6_pipe2depth(VkFormat format); -struct tu_image_level -{ - VkDeviceSize offset; - VkDeviceSize size; - uint32_t pitch; -}; - struct tu_image { VkImageType type; @@ -1362,9 +1355,6 @@ struct tu_image uint32_t layer_count; VkSampleCountFlagBits samples; - - uint32_t alignment; - struct fdl_layout layout; unsigned queue_family_mask; -- 2.30.2