Update Vulkan framework to API 138.1

Change-Id: I2358da83b693f6d18b2bd05bbb4907a7f782cc38

diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
index 4436b21..9d392fe 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@ -1,7 +1,7 @@
 /* WARNING: This is auto-generated file. Do not modify, since changes will
  * be lost! Modify the generating script instead.
  */
-#define VK_API_VERSION                         VK_MAKE_VERSION(0, 138, 0)
+#define VK_API_VERSION                         VK_MAKE_VERSION(0, 138, 1)
 #define VK_MAX_PHYSICAL_DEVICE_NAME    256
 #define VK_MAX_EXTENSION_NAME          256
 #define VK_UUID_LENGTH                         16
@@ -121,22 +121,21 @@ enum VkStructureType
        VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO                                       = 32,
        VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO                                         = 33,
        VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO                                       = 34,
-       VK_STRUCTURE_TYPE_LAYER_CREATE_INFO                                                     = 35,
-       VK_STRUCTURE_TYPE_MEMORY_BARRIER                                                        = 36,
-       VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER                                         = 37,
-       VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER                                          = 38,
-       VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO                           = 39,
-       VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET                                          = 40,
-       VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET                                           = 41,
-       VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO                                          = 42,
-       VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO                           = 43,
-       VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE                                           = 44,
-       VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO                            = 45,
-       VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION                                        = 46,
-       VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION                                           = 47,
-       VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY                                            = 48,
-       VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO                                        = 49,
-       VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO                                          = 50,
+       VK_STRUCTURE_TYPE_MEMORY_BARRIER                                                        = 35,
+       VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER                                         = 36,
+       VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER                                          = 37,
+       VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO                           = 38,
+       VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET                                          = 39,
+       VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET                                           = 40,
+       VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO                                          = 41,
+       VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO                           = 42,
+       VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE                                           = 43,
+       VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO                            = 44,
+       VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION                                        = 45,
+       VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION                                           = 46,
+       VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY                                            = 47,
+       VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO                                        = 48,
+       VK_STRUCTURE_TYPE_CMD_POOL_CREATE_INFO                                          = 49,
 };
 
 enum VkSystemAllocType

diff --git a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl
index e061200..9c0c90c 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl
+++ b/external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl
@@ -76,6 +76,7 @@ virtual VkResult      createDescriptorPool                                                    (VkDevice device, VkDescriptorPoolUs
 virtual VkResult       destroyDescriptorPool                                                   (VkDevice device, VkDescriptorPool descriptorPool) const;
 virtual VkResult       resetDescriptorPool                                                             (VkDevice device, VkDescriptorPool descriptorPool) const;
 virtual VkResult       allocDescriptorSets                                                             (VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, deUint32 count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets, deUint32* pCount) const;
+virtual VkResult       freeDescriptorSets                                                              (VkDevice device, VkDescriptorPool descriptorPool, deUint32 count, const VkDescriptorSet* pDescriptorSets) const;
 virtual VkResult       updateDescriptorSets                                                    (VkDevice device, deUint32 writeCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 copyCount, const VkCopyDescriptorSet* pDescriptorCopies) const;
 virtual VkResult       createDynamicViewportState                                              (VkDevice device, const VkDynamicViewportStateCreateInfo* pCreateInfo, VkDynamicViewportState* pState) const;
 virtual VkResult       destroyDynamicViewportState                                             (VkDevice device, VkDynamicViewportState dynamicViewportState) const;

diff --git a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl
index eb71ea8..103bd06 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl
@@ -377,6 +377,11 @@ VkResult DeviceDriver::allocDescriptorSets (VkDevice device, VkDescriptorPool de
        return m_vk.allocDescriptorSets(device, descriptorPool, setUsage, count, pSetLayouts, pDescriptorSets, pCount);
 }
 
+VkResult DeviceDriver::freeDescriptorSets (VkDevice device, VkDescriptorPool descriptorPool, deUint32 count, const VkDescriptorSet* pDescriptorSets) const
+{
+       return m_vk.freeDescriptorSets(device, descriptorPool, count, pDescriptorSets);
+}
+
 VkResult DeviceDriver::updateDescriptorSets (VkDevice device, deUint32 writeCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 copyCount, const VkCopyDescriptorSet* pDescriptorCopies) const
 {
        return m_vk.updateDescriptorSets(device, writeCount, pDescriptorWrites, copyCount, pDescriptorCopies);

diff --git a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl
index a32250c..89fe667 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl
@@ -76,6 +76,7 @@ CreateDescriptorPoolFunc                                                      createDescriptorPool;
 DestroyDescriptorPoolFunc                                                      destroyDescriptorPool;
 ResetDescriptorPoolFunc                                                                resetDescriptorPool;
 AllocDescriptorSetsFunc                                                                allocDescriptorSets;
+FreeDescriptorSetsFunc                                                         freeDescriptorSets;
 UpdateDescriptorSetsFunc                                                       updateDescriptorSets;
 CreateDynamicViewportStateFunc                                         createDynamicViewportState;
 DestroyDynamicViewportStateFunc                                                destroyDynamicViewportState;

diff --git a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl
index 2e4fc7b..fdc35d4 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl
@@ -90,6 +90,7 @@ typedef VK_APICALL VkResult                           (VK_APIENTRY* CreateDescriptorPoolFunc)                                                 (Vk
 typedef VK_APICALL VkResult                            (VK_APIENTRY* DestroyDescriptorPoolFunc)                                                (VkDevice device, VkDescriptorPool descriptorPool);
 typedef VK_APICALL VkResult                            (VK_APIENTRY* ResetDescriptorPoolFunc)                                                  (VkDevice device, VkDescriptorPool descriptorPool);
 typedef VK_APICALL VkResult                            (VK_APIENTRY* AllocDescriptorSetsFunc)                                                  (VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, deUint32 count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets, deUint32* pCount);
+typedef VK_APICALL VkResult                            (VK_APIENTRY* FreeDescriptorSetsFunc)                                                   (VkDevice device, VkDescriptorPool descriptorPool, deUint32 count, const VkDescriptorSet* pDescriptorSets);
 typedef VK_APICALL VkResult                            (VK_APIENTRY* UpdateDescriptorSetsFunc)                                                 (VkDevice device, deUint32 writeCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 copyCount, const VkCopyDescriptorSet* pDescriptorCopies);
 typedef VK_APICALL VkResult                            (VK_APIENTRY* CreateDynamicViewportStateFunc)                                   (VkDevice device, const VkDynamicViewportStateCreateInfo* pCreateInfo, VkDynamicViewportState* pState);
 typedef VK_APICALL VkResult                            (VK_APIENTRY* DestroyDynamicViewportStateFunc)                                  (VkDevice device, VkDynamicViewportState dynamicViewportState);

diff --git a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl
index bfed88b..654153b 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl
+++ b/external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl
@@ -76,6 +76,7 @@ m_vk.createDescriptorPool                                                     = (CreateDescriptorPoolFunc)                                                    GET_PROC_ADDR
 m_vk.destroyDescriptorPool                                                     = (DestroyDescriptorPoolFunc)                                                   GET_PROC_ADDR("vkDestroyDescriptorPool");
 m_vk.resetDescriptorPool                                                       = (ResetDescriptorPoolFunc)                                                             GET_PROC_ADDR("vkResetDescriptorPool");
 m_vk.allocDescriptorSets                                                       = (AllocDescriptorSetsFunc)                                                             GET_PROC_ADDR("vkAllocDescriptorSets");
+m_vk.freeDescriptorSets                                                                = (FreeDescriptorSetsFunc)                                                              GET_PROC_ADDR("vkFreeDescriptorSets");
 m_vk.updateDescriptorSets                                                      = (UpdateDescriptorSetsFunc)                                                    GET_PROC_ADDR("vkUpdateDescriptorSets");
 m_vk.createDynamicViewportState                                                = (CreateDynamicViewportStateFunc)                                              GET_PROC_ADDR("vkCreateDynamicViewportState");
 m_vk.destroyDynamicViewportState                                       = (DestroyDynamicViewportStateFunc)                                             GET_PROC_ADDR("vkDestroyDynamicViewportState");

diff --git a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
index 5341772..67d23b7 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
+++ b/external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
@@ -619,6 +619,15 @@ VkResult allocDescriptorSets (VkDevice device, VkDescriptorPool descriptorPool,
        return VK_SUCCESS;
 }
 
+VkResult freeDescriptorSets (VkDevice device, VkDescriptorPool descriptorPool, deUint32 count, const VkDescriptorSet* pDescriptorSets)
+{
+       DE_UNREF(device);
+       DE_UNREF(descriptorPool);
+       DE_UNREF(count);
+       DE_UNREF(pDescriptorSets);
+       return VK_SUCCESS;
+}
+
 VkResult updateDescriptorSets (VkDevice device, deUint32 writeCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 copyCount, const VkCopyDescriptorSet* pDescriptorCopies)
 {
        DE_UNREF(device);
@@ -1112,6 +1121,7 @@ static const tcu::StaticFunctionLibrary::Entry s_deviceFunctions[] =
        VK_NULL_FUNC_ENTRY(vkDestroyDescriptorPool,                                                     destroyDescriptorPool),
        VK_NULL_FUNC_ENTRY(vkResetDescriptorPool,                                                       resetDescriptorPool),
        VK_NULL_FUNC_ENTRY(vkAllocDescriptorSets,                                                       allocDescriptorSets),
+       VK_NULL_FUNC_ENTRY(vkFreeDescriptorSets,                                                        freeDescriptorSets),
        VK_NULL_FUNC_ENTRY(vkUpdateDescriptorSets,                                                      updateDescriptorSets),
        VK_NULL_FUNC_ENTRY(vkCreateDynamicViewportState,                                        createDynamicViewportState),
        VK_NULL_FUNC_ENTRY(vkDestroyDynamicViewportState,                                       destroyDynamicViewportState),

diff --git a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
index 7cdbaac..f5774f0 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
+++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
@@ -119,7 +119,6 @@ const char* getStructureTypeName (VkStructureType value)
                case VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO:                                         return "VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO";
                case VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO:                                           return "VK_STRUCTURE_TYPE_CMD_BUFFER_BEGIN_INFO";
                case VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO:                                         return "VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO";
-               case VK_STRUCTURE_TYPE_LAYER_CREATE_INFO:                                                       return "VK_STRUCTURE_TYPE_LAYER_CREATE_INFO";
                case VK_STRUCTURE_TYPE_MEMORY_BARRIER:                                                          return "VK_STRUCTURE_TYPE_MEMORY_BARRIER";
                case VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER:                                           return "VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER";
                case VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER:                                            return "VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER";

diff --git a/external/vulkancts/framework/vulkan/vkStructTypes.inl b/external/vulkancts/framework/vulkan/vkStructTypes.inl
index 9f236e2..e8ddd12 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkStructTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkStructTypes.inl
@@ -270,7 +270,7 @@ struct VkLayerProperties
        char            layerName[VK_MAX_EXTENSION_NAME];
        deUint32        specVersion;
        deUint32        implVersion;
-       const char*     description[VK_MAX_DESCRIPTION];
+       char            description[VK_MAX_DESCRIPTION];
 };
 
 struct VkMemoryAllocInfo
@@ -509,7 +509,7 @@ struct VkSpecializationInfo
 {
        deUint32                                                mapEntryCount;
        const VkSpecializationMapEntry* pMap;
-       const deUintptr                                 dataSize;
+       deUintptr                                               dataSize;
        const void*                                             pData;
 };
 

diff --git a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl
index 54e012d..f43cbfb 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl
+++ b/external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl
@@ -76,6 +76,7 @@ virtual VkResult      createDescriptorPool                                                    (VkDevice device, VkDescriptorPoolUs
 virtual VkResult       destroyDescriptorPool                                                   (VkDevice device, VkDescriptorPool descriptorPool) const = 0;
 virtual VkResult       resetDescriptorPool                                                             (VkDevice device, VkDescriptorPool descriptorPool) const = 0;
 virtual VkResult       allocDescriptorSets                                                             (VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, deUint32 count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets, deUint32* pCount) const = 0;
+virtual VkResult       freeDescriptorSets                                                              (VkDevice device, VkDescriptorPool descriptorPool, deUint32 count, const VkDescriptorSet* pDescriptorSets) const = 0;
 virtual VkResult       updateDescriptorSets                                                    (VkDevice device, deUint32 writeCount, const VkWriteDescriptorSet* pDescriptorWrites, deUint32 copyCount, const VkCopyDescriptorSet* pDescriptorCopies) const = 0;
 virtual VkResult       createDynamicViewportState                                              (VkDevice device, const VkDynamicViewportStateCreateInfo* pCreateInfo, VkDynamicViewportState* pState) const = 0;
 virtual VkResult       destroyDynamicViewportState                                             (VkDevice device, VkDynamicViewportState dynamicViewportState) const = 0;