Remove heap size padding
Adding 15 bytes to the heap size worked around a minor bug in the Vulkan
Memory Allocator (VMA), used by ANGLE, which triggered a Validation
Layer error. This benign error has now been suppressed by ANGLE so the
hack can be removed.
Bug: b/201282910
Bug: angleproject:6444
Change-Id: I458fd986326284d4ddfbdd8912c524061eead2d5
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/61328
Reviewed-by: Alexis Hétu <sugoi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Vulkan/VkConfig.hpp b/src/Vulkan/VkConfig.hpp
index b8ef29b..a6145bd 100644
--- a/src/Vulkan/VkConfig.hpp
+++ b/src/Vulkan/VkConfig.hpp
@@ -75,9 +75,8 @@
constexpr int SUBPIXEL_PRECISION_MASK = 0xFFFFFFFF >> (32 - SUBPIXEL_PRECISION_BITS);
// TODO: The heap size should be configured based on available RAM.
-// FIXME(angleproject:6444): Remove the 15 bytes of padding.
-constexpr VkDeviceSize PHYSICAL_DEVICE_HEAP_SIZE = 0x80000000ull + 15; // 0x80000000 = 2 GiB
-constexpr VkDeviceSize MAX_MEMORY_ALLOCATION_SIZE = 0x40000000ull; // 0x40000000 = 1 GiB
+constexpr VkDeviceSize PHYSICAL_DEVICE_HEAP_SIZE = 0x80000000ull; // 0x80000000 = 2 GiB
+constexpr VkDeviceSize MAX_MEMORY_ALLOCATION_SIZE = 0x40000000ull; // 0x40000000 = 1 GiB
// Memory offset calculations in 32-bit SIMD elements limit us to addressing at most 4 GiB.
// Signed arithmetic further restricts it to 2 GiB.
