Update VK_KHR_vulkan_memory_model to spec version 3

Components: Vulkan
Affects: dEQP-VK.memory_model.*
Change-Id: I3ba8a275092f0a2fcfef02cdabf2ab51750f74f5

diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
index 01865f6..172a41f 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@ -2212,5 +2212,5 @@ VK_DEFINE_PLATFORM_TYPE(RROutput,                                 void*);
 #define VK_EXT_DESCRIPTOR_INDEXING_SPEC_VERSION 2
 #define VK_EXT_INLINE_UNIFORM_BLOCK_SPEC_VERSION 1
 #define VK_KHR_SHADER_ATOMIC_INT64_SPEC_VERSION 1
-#define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 2
+#define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 3
 #define VK_EXT_SCALAR_BLOCK_LAYOUT_SPEC_VERSION 1

diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
index 7856475..ec13088 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
+++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
@@ -6443,6 +6443,7 @@ std::ostream& operator<< (std::ostream& s, const VkPhysicalDeviceVulkanMemoryMod
        s << "\tpNext = " << value.pNext << '\n';
        s << "\tvulkanMemoryModel = " << value.vulkanMemoryModel << '\n';
        s << "\tvulkanMemoryModelDeviceScope = " << value.vulkanMemoryModelDeviceScope << '\n';
+       s << "\tvulkanMemoryModelAvailabilityVisibilityChains = " << value.vulkanMemoryModelAvailabilityVisibilityChains << '\n';
        s << '}';
        return s;
 }

diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl
index a7df481..3824474 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkStructTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl
@@ -3128,6 +3128,7 @@ struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR
        void*                   pNext;
        VkBool32                vulkanMemoryModel;
        VkBool32                vulkanMemoryModelDeviceScope;
+       VkBool32                vulkanMemoryModelAvailabilityVisibilityChains;
 };
 
 struct VkPhysicalDeviceScalarBlockLayoutFeaturesEXT

diff --git a/external/vulkancts/scripts/src/vulkan.h.in b/external/vulkancts/scripts/src/vulkan.h.in
index 8877a02..065fa8b 100755 (executable)
--- a/external/vulkancts/scripts/src/vulkan.h.in
+++ b/external/vulkancts/scripts/src/vulkan.h.in
@@ -7939,7 +7939,7 @@ typedef struct VkPhysicalDeviceShaderAtomicInt64FeaturesKHR {
 
 
 #define VK_KHR_vulkan_memory_model 1
-#define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 2
+#define VK_KHR_VULKAN_MEMORY_MODEL_SPEC_VERSION 3
 #define VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME "VK_KHR_vulkan_memory_model"
 
 typedef struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR {
@@ -7947,6 +7947,7 @@ typedef struct VkPhysicalDeviceVulkanMemoryModelFeaturesKHR {
     void*              pNext;
     VkBool32           vulkanMemoryModel;
     VkBool32           vulkanMemoryModelDeviceScope;
+    VkBool32           vulkanMemoryModelAvailabilityVisibilityChains;
 } VkPhysicalDeviceVulkanMemoryModelFeaturesKHR;