diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp
index 890c743..293cbdb 100644
--- a/include/vulkan/vulkan.hpp
+++ b/include/vulkan/vulkan.hpp
@@ -56,7 +56,7 @@
# define VULKAN_HPP_ASSERT assert
#endif
-static_assert( VK_HEADER_VERSION == 111 , "Wrong VK_HEADER_VERSION!" );
+static_assert( VK_HEADER_VERSION == 112 , "Wrong VK_HEADER_VERSION!" );
// 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default.
// To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION
@@ -3361,7 +3361,8 @@ namespace VULKAN_HPP_NAMESPACE
eQualcommProprietary = VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR,
eArmProprietary = VK_DRIVER_ID_ARM_PROPRIETARY_KHR,
eGoogleSwiftshader = VK_DRIVER_ID_GOOGLE_SWIFTSHADER_KHR,
- eGgpProprietary = VK_DRIVER_ID_GGP_PROPRIETARY_KHR
+ eGgpProprietary = VK_DRIVER_ID_GGP_PROPRIETARY_KHR,
+ eBroadcomProprietary = VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR
};
VULKAN_HPP_INLINE std::string to_string( DriverIdKHR value )
@@ -3379,6 +3380,7 @@ namespace VULKAN_HPP_NAMESPACE
case DriverIdKHR::eArmProprietary : return "ArmProprietary";
case DriverIdKHR::eGoogleSwiftshader : return "GoogleSwiftshader";
case DriverIdKHR::eGgpProprietary : return "GgpProprietary";
+ case DriverIdKHR::eBroadcomProprietary : return "BroadcomProprietary";
default: return "invalid";
}
}
@@ -58106,8 +58108,8 @@ namespace VULKAN_HPP_NAMESPACE
// This interface does not require a linked vulkan library.
void init( VkInstance instance, PFN_vkGetInstanceProcAddr getInstanceProcAddr, VkDevice device = VK_NULL_HANDLE, PFN_vkGetDeviceProcAddr getDeviceProcAddr = nullptr )
{
- assert(instance && getInstanceProcAddr);
- assert(!!device == !!getDeviceProcAddr);
+ VULKAN_HPP_ASSERT(instance && getInstanceProcAddr);
+ VULKAN_HPP_ASSERT(!!device == !!getDeviceProcAddr);
vkGetInstanceProcAddr = getInstanceProcAddr;
vkGetDeviceProcAddr = getDeviceProcAddr ? getDeviceProcAddr : PFN_vkGetDeviceProcAddr( vkGetInstanceProcAddr( instance, "vkGetDeviceProcAddr") );
vkCreateInstance = PFN_vkCreateInstance( vkGetInstanceProcAddr( instance, "vkCreateInstance" ) );
diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h
index af35682..bc15e27 100644
--- a/include/vulkan/vulkan_core.h
+++ b/include/vulkan/vulkan_core.h
@@ -43,7 +43,7 @@ extern "C" {
#define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff)
#define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff)
// Version of this file
-#define VK_HEADER_VERSION 111
+#define VK_HEADER_VERSION 112
#define VK_NULL_HANDLE 0
@@ -6138,9 +6138,10 @@ typedef enum VkDriverIdKHR {
VK_DRIVER_ID_ARM_PROPRIETARY_KHR = 9,
VK_DRIVER_ID_GOOGLE_SWIFTSHADER_KHR = 10,
VK_DRIVER_ID_GGP_PROPRIETARY_KHR = 11,
+ VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR = 12,
VK_DRIVER_ID_BEGIN_RANGE_KHR = VK_DRIVER_ID_AMD_PROPRIETARY_KHR,
- VK_DRIVER_ID_END_RANGE_KHR = VK_DRIVER_ID_GGP_PROPRIETARY_KHR,
- VK_DRIVER_ID_RANGE_SIZE_KHR = (VK_DRIVER_ID_GGP_PROPRIETARY_KHR - VK_DRIVER_ID_AMD_PROPRIETARY_KHR + 1),
+ VK_DRIVER_ID_END_RANGE_KHR = VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR,
+ VK_DRIVER_ID_RANGE_SIZE_KHR = (VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR - VK_DRIVER_ID_AMD_PROPRIETARY_KHR + 1),
VK_DRIVER_ID_MAX_ENUM_KHR = 0x7FFFFFFF
} VkDriverIdKHR;
typedef struct VkConformanceVersionKHR {
@@ -6379,7 +6380,7 @@ VKAPI_ATTR void VKAPI_CALL vkDebugReportMessageEXT(
#define VK_IMG_filter_cubic 1
-#define VK_IMG_FILTER_CUBIC_SPEC_VERSION 2
+#define VK_IMG_FILTER_CUBIC_SPEC_VERSION 1
#define VK_IMG_FILTER_CUBIC_EXTENSION_NAME "VK_IMG_filter_cubic"
@@ -8542,7 +8543,7 @@ typedef struct VkPipelineRepresentativeFragmentTestStateCreateInfoNV {
#define VK_EXT_filter_cubic 1
-#define VK_EXT_FILTER_CUBIC_SPEC_VERSION 1
+#define VK_EXT_FILTER_CUBIC_SPEC_VERSION 2
#define VK_EXT_FILTER_CUBIC_EXTENSION_NAME "VK_EXT_filter_cubic"
typedef struct VkPhysicalDeviceImageViewImageFormatInfoEXT {
VkStructureType sType;
diff --git a/registry/validusage.json b/registry/validusage.json
index 6db30db..9f9e6bd 100644
--- a/registry/validusage.json
+++ b/registry/validusage.json
@@ -1,9 +1,9 @@
{
"version info": {
"schema version": 2,
- "api version": "1.1.111",
- "comment": "from git branch: github-master commit: ad46c7dc688fe973ac7299b651403be5f562db8e",
- "date": "2019-06-10 10:33:18Z"
+ "api version": "1.1.112",
+ "comment": "from git branch: github-master commit: 7376fb77d1a43d79bb1cfd919d493d21b963d5ef",
+ "date": "2019-06-24 03:30:45Z"
},
"validation": {
"vkGetInstanceProcAddr": {
@@ -3138,7 +3138,7 @@
},
{
"vuid": "VUID-VkRenderPassCreateInfo-pNext-02516",
- "text": " If the pNext chain includes an instance of VkRenderPassMultiviewCreateInfo, each element of its pViewMask member must not include a bit at a position greater than the value of VkPhysicalDeviceLimits::maxFramebufferLayers"
+ "text": " If the pNext chain includes an instance of VkRenderPassMultiviewCreateInfo, each element of its pViewMask member must not have a bit set at an index greater than or equal to VkPhysicalDeviceLimits::maxFramebufferLayers"
}
]
},
@@ -3588,7 +3588,7 @@
},
{
"vuid": "VUID-VkRenderPassCreateInfo2KHR-viewMask-02524",
- "text": " The viewMask member must not include a bit at a position greater than the value of VkPhysicalDeviceLimits::maxFramebufferLayers"
+ "text": " The viewMask member must not have a bit set at an index greater than or equal to VkPhysicalDeviceLimits::maxFramebufferLayers"
},
{
"vuid": "VUID-VkRenderPassCreateInfo2KHR-attachment-02525",
@@ -4163,16 +4163,42 @@
"text": " Each element of pAttachments must have dimensions at least as large as the corresponding framebuffer dimension"
}
],
- "(VK_VERSION_1_1,VK_KHR_maintenance1)": [
+ "!(VK_EXT_fragment_density_map)+(VK_VERSION_1_1,VK_KHR_multiview)": [
{
- "vuid": "VUID-VkFramebufferCreateInfo-pAttachments-00891",
- "text": " Each element of pAttachments that is a 2D or 2D array image view taken from a 3D image must not be a depth/stencil format"
+ "vuid": "VUID-VkFramebufferCreateInfo-renderPass-02743",
+ "text": " If renderPass was specified with non-zero view masks, each element of pAttachments must have a layerCount greater than the index of the most significant bit set in any of those view masks"
+ }
+ ],
+ "(VK_EXT_fragment_density_map)+!(VK_VERSION_1_1,VK_KHR_multiview)": [
+ {
+ "vuid": "VUID-VkFramebufferCreateInfo-pAttachments-02744",
+ "text": " An element of pAttachments that is referenced by fragmentDensityMapAttachment must have a layerCount equal to 1"
+ }
+ ],
+ "(VK_EXT_fragment_density_map)+(VK_VERSION_1_1,VK_KHR_multiview)": [
+ {
+ "vuid": "VUID-VkFramebufferCreateInfo-renderPass-02745",
+ "text": " If renderPass was specified with non-zero view masks, each element of pAttachments that is not referenced by fragmentDensityMapAttachment must have a layerCount greater than the index of the most significant bit set in any of those view masks"
+ },
+ {
+ "vuid": "VUID-VkFramebufferCreateInfo-renderPass-02746",
+ "text": " If renderPass was specified with non-zero view masks, each element of pAttachments that is referenced by fragmentDensityMapAttachment must have a layerCount equal to 1 or greater than the index of the most significant bit set in any of those view masks"
+ },
+ {
+ "vuid": "VUID-VkFramebufferCreateInfo-renderPass-02747",
+ "text": " If renderPass was not specified with non-zero view masks, each element of pAttachments that is referenced by fragmentDensityMapAttachment must have a layerCount equal to 1"
}
],
"(VK_VERSION_1_1,VK_KHR_multiview)": [
{
"vuid": "VUID-VkFramebufferCreateInfo-renderPass-02531",
- "text": " If renderPass was specified with non-zero view masks, layers must be greater than or equal to the greatest position of any bit included in any of those view masks"
+ "text": " If renderPass was specified with non-zero view masks, layers must be 1"
+ }
+ ],
+ "(VK_VERSION_1_1,VK_KHR_maintenance1)": [
+ {
+ "vuid": "VUID-VkFramebufferCreateInfo-pAttachments-00891",
+ "text": " Each element of pAttachments that is a 2D or 2D array image view taken from a 3D image must not be a depth/stencil format"
}
]
},
@@ -10280,6 +10306,10 @@
"vuid": "VUID-VkSamplerYcbcrConversionCreateInfo-ycbcrModel-01655",
"text": " If ycbcrModel is not VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY, then components.r, components.g, and components.b must correspond to channels of the format; that is, components.r, components.g, and components.b must not be VK_COMPONENT_SWIZZLE_ZERO or VK_COMPONENT_SWIZZLE_ONE, and must not correspond to a channel which contains zero or one as a consequence of conversion to RGBA"
},
+ {
+ "vuid": "VUID-VkSamplerYcbcrConversionCreateInfo-ycbcrRange-02748",
+ "text": " If ycbcrRange is VK_SAMPLER_YCBCR_RANGE_ITU_NARROW then the R, G and B channels obtained by applying the component swizzle to format must each have a bit-depth greater than or equal to 8."
+ },
{
"vuid": "VUID-VkSamplerYcbcrConversionCreateInfo-forceExplicitReconstruction-01656",
"text": " If the format does not support VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT, forceExplicitReconstruction must be FALSE"
@@ -12082,6 +12112,14 @@
"vuid": "VUID-vkResetQueryPoolEXT-firstQuery-02667",
"text": " The sum of firstQuery and queryCount must be less than or equal to the number of queries in queryPool"
},
+ {
+ "vuid": "VUID-vkResetQueryPoolEXT-firstQuery-02741",
+ "text": " Submitted commands that refer to the range specified by firstQuery and queryCount in queryPool must have completed execution"
+ },
+ {
+ "vuid": "VUID-vkResetQueryPoolEXT-firstQuery-02742",
+ "text": " The range of queries specified by firstQuery and queryCount in queryPool must not be in use by calls to vkGetQueryPoolResults or vkResetQueryPoolEXT in other threads"
+ },
{
"vuid": "VUID-vkResetQueryPoolEXT-device-parameter",
"text": " device must be a valid VkDevice handle"
@@ -12160,7 +12198,7 @@
"(VK_VERSION_1_1,VK_KHR_multiview)": [
{
"vuid": "VUID-vkCmdBeginQuery-query-00808",
- "text": " If vkCmdBeginQuery is called within a render pass instance, the sum of query and the number of bits set in the current subpass’s view mask must be less than or equal to the number of queries in queryPool"
+ "text": " If called within a render pass instance, the sum of query and the number of bits set in the current subpass’s view mask must be less than or equal to the number of queries in queryPool"
}
],
"(VK_EXT_transform_feedback)": [
@@ -12177,31 +12215,31 @@
"vkCmdBeginQueryIndexedEXT": {
"(VK_EXT_transform_feedback)": [
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryPool-02329",
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryPool-01922",
"text": " queryPool must have been created with a queryType that differs from that of any queries that are active within commandBuffer"
},
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-None-02330",
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-None-00807",
"text": " All queries used by the command must be unavailable"
},
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-02331",
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-00800",
"text": " If the precise occlusion queries feature is not enabled, or the queryType used to create queryPool was not VK_QUERY_TYPE_OCCLUSION, flags must not contain VK_QUERY_CONTROL_PRECISE_BIT"
},
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-query-02332",
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-query-00802",
"text": " query must be less than the number of queries in queryPool"
},
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-02333",
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-00803",
"text": " If the queryType used to create queryPool was VK_QUERY_TYPE_OCCLUSION, the VkCommandPool that commandBuffer was allocated from must support graphics operations"
},
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-02334",
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-00804",
"text": " If the queryType used to create queryPool was VK_QUERY_TYPE_PIPELINE_STATISTICS and any of the pipelineStatistics indicate graphics operations, the VkCommandPool that commandBuffer was allocated from must support graphics operations"
},
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-02335",
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-queryType-00805",
"text": " If the queryType used to create queryPool was VK_QUERY_TYPE_PIPELINE_STATISTICS and any of the pipelineStatistics indicate compute operations, the VkCommandPool that commandBuffer was allocated from must support compute operations"
},
{
@@ -12247,14 +12285,14 @@
],
"(VK_EXT_transform_feedback)+(VK_VERSION_1_1)": [
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-commandBuffer-02336",
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-commandBuffer-01885",
"text": " commandBuffer must not be a protected command buffer"
}
],
"(VK_EXT_transform_feedback)+(VK_VERSION_1_1,VK_KHR_multiview)": [
{
- "vuid": "VUID-vkCmdBeginQueryIndexedEXT-query-02337",
- "text": " If vkCmdBeginQuery is called within a render pass instance, the sum of query and the number of bits set in the current subpass’s view mask must be less than or equal to the number of queries in queryPool"
+ "vuid": "VUID-vkCmdBeginQueryIndexedEXT-query-00808",
+ "text": " If called within a render pass instance, the sum of query and the number of bits set in the current subpass’s view mask must be less than or equal to the number of queries in queryPool"
}
]
},
diff --git a/registry/vk.xml b/registry/vk.xml
index 4eba3c1..a0ebc9a 100644
--- a/registry/vk.xml
+++ b/registry/vk.xml
@@ -154,7 +154,7 @@ server.
// Vulkan 1.1 version number
#define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0)// Patch version should always be set to 0
// Version of this file
-#define VK_HEADER_VERSION 111
+#define VK_HEADER_VERSION 112
#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;
@@ -5097,6 +5097,7 @@ typedef void CAMetalLayer;
+
@@ -8284,7 +8285,7 @@ typedef void CAMetalLayer;
-
+
@@ -10199,7 +10200,7 @@ typedef void CAMetalLayer;
-
+