Merge vk-gl-cts/github-master into vk-gl-cts/master

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / framework / vulkan / vkBasicTypes.inl

diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
index 4b0b473..f6ad440 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@ -259,6 +259,9 @@ enum VkStructureType
        VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR                                                                  = 1000079000,
        VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR                                                                             = 1000079001,
        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR                                = 1000080000,
+       VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT             = 1000081000,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT                    = 1000081001,
+       VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT                                                  = 1000081002,
        VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR                                                                                   = 1000084000,
        VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX                                                                  = 1000086000,
        VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX                                              = 1000086001,
@@ -1452,15 +1455,16 @@ typedef deUint32 VkBufferCreateFlags;
 
 enum VkBufferUsageFlagBits
 {
-       VK_BUFFER_USAGE_TRANSFER_SRC_BIT                        = 0x00000001,
-       VK_BUFFER_USAGE_TRANSFER_DST_BIT                        = 0x00000002,
-       VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT        = 0x00000004,
-       VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT        = 0x00000008,
-       VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT                      = 0x00000010,
-       VK_BUFFER_USAGE_STORAGE_BUFFER_BIT                      = 0x00000020,
-       VK_BUFFER_USAGE_INDEX_BUFFER_BIT                        = 0x00000040,
-       VK_BUFFER_USAGE_VERTEX_BUFFER_BIT                       = 0x00000080,
-       VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT                     = 0x00000100,
+       VK_BUFFER_USAGE_TRANSFER_SRC_BIT                                = 0x00000001,
+       VK_BUFFER_USAGE_TRANSFER_DST_BIT                                = 0x00000002,
+       VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT                = 0x00000004,
+       VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT                = 0x00000008,
+       VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT                              = 0x00000010,
+       VK_BUFFER_USAGE_STORAGE_BUFFER_BIT                              = 0x00000020,
+       VK_BUFFER_USAGE_INDEX_BUFFER_BIT                                = 0x00000040,
+       VK_BUFFER_USAGE_VERTEX_BUFFER_BIT                               = 0x00000080,
+       VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT                             = 0x00000100,
+       VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT   = 0x00000200,
 };
 typedef deUint32 VkBufferUsageFlags;
 
@@ -1551,6 +1555,7 @@ enum VkAccessFlagBits
        VK_ACCESS_HOST_WRITE_BIT                                                        = 0x00004000,
        VK_ACCESS_MEMORY_READ_BIT                                                       = 0x00008000,
        VK_ACCESS_MEMORY_WRITE_BIT                                                      = 0x00010000,
+       VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT            = 0x00100000,
        VK_ACCESS_COMMAND_PROCESS_READ_BIT_NVX                          = 0x00020000,
        VK_ACCESS_COMMAND_PROCESS_WRITE_BIT_NVX                         = 0x00040000,
        VK_ACCESS_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT     = 0x00080000,
@@ -1780,6 +1785,12 @@ enum VkExternalMemoryFeatureFlagBitsNV
 };
 typedef deUint32 VkExternalMemoryFeatureFlagsNV;
 
+enum VkConditionalRenderingFlagBitsEXT
+{
+       VK_CONDITIONAL_RENDERING_INVERTED_BIT_EXT       = 0x00000001,
+};
+typedef deUint32 VkConditionalRenderingFlagsEXT;
+
 enum VkIndirectCommandsLayoutUsageFlagBitsNVX
 {
        VK_INDIRECT_COMMANDS_LAYOUT_USAGE_UNORDERED_SEQUENCES_BIT_NVX   = 0x00000001,