vk/vulkan.h: Move around buffer image granularities

diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h
index b9db32954a83cf19bf67f41eb2d2b15e2962d5e7..fa9f6085d75ccfcf57764d2658caf042aa1e3acb 100644 (file)
--- a/include/vulkan/vulkan.h
+++ b/include/vulkan/vulkan.h
@@ -1210,6 +1210,7 @@ typedef struct {
     uint32_t                                    maxStorageBufferSize;
     uint32_t                                    maxPushConstantsSize;
     uint32_t                                    maxMemoryAllocationCount;
+    VkDeviceSize                                bufferImageGranularity;
     uint32_t                                    maxBoundDescriptorSets;
     uint32_t                                    maxDescriptorSets;
     uint32_t                                    maxPerStageDescriptorSamplers;
@@ -1375,7 +1376,6 @@ typedef struct {
 typedef struct {
     VkDeviceSize                                size;
     VkDeviceSize                                alignment;
-    VkDeviceSize                                granularity;
     uint32_t                                    memoryTypeBits;
 } VkMemoryRequirements;
 

diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index b53000a537269b43749645156933c1434948c5ad..d86a297e11ffd0dbf1c66a14a1f15e54c3bf711d 100644 (file)
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -280,6 +280,7 @@ VkResult anv_GetPhysicalDeviceLimits(
       .maxStorageBufferSize                     = UINT32_MAX,
       .maxPushConstantsSize                     = 128,
       .maxMemoryAllocationCount                 = UINT32_MAX,
+      .bufferImageGranularity                   = 64, /* A cache line */
       .maxBoundDescriptorSets                   = MAX_SETS,
       .maxDescriptorSets                        = UINT32_MAX,
       .maxPerStageDescriptorSamplers            = 64,