From a0de2e0090535bd49b70c52917e7bdab628d354a Mon Sep 17 00:00:00 2001
From: Arcady Goldmints-Orlov <agoldmints@igalia.com>
Date: Tue, 28 Apr 2020 19:46:48 -0500
Subject: [PATCH] anv: increase minUniformBufferOffsetAlignment to 64

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4904>
---
 src/intel/vulkan/anv_device.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 8b54408eff0..52ce55eeb84 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -1505,8 +1505,10 @@ void anv_GetPhysicalDeviceProperties(
        * case of R32G32B32A32 which is 16 bytes.
        */
       .minTexelBufferOffsetAlignment            = 16,
-      /* We need 16 for UBO block reads to work and 32 for push UBOs */
-      .minUniformBufferOffsetAlignment          = 32,
+      /* We need 16 for UBO block reads to work and 32 for push UBOs.
+       *  However, we use 64 here to avoid cache issues.
+       */
+      .minUniformBufferOffsetAlignment          = 64,
       .minStorageBufferOffsetAlignment          = 4,
       .minTexelOffset                           = -8,
       .maxTexelOffset                           = 7,
-- 
2.30.2