aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorShannon McPherson <[email protected]>2018-07-24 10:16:26 -0600
committerShannon McPherson <[email protected]>2018-07-24 10:16:26 -0600
commit82e73015b0632833939349d767af39cb88836f29 (patch)
treea10ec24d4e9750d3c53e2a4fd8fdba8ddac73388 /include
parentc339af82091857146e940fa1aafbeb5ee67d7e21 (diff)
downloadVulkan-Headers-82e73015b0632833939349d767af39cb88836f29.tar.gz
Vulkan-Headers-82e73015b0632833939349d767af39cb88836f29.zip
headers: Update to version 1.1.81 of the Vulkan hdr
- updated validusage.json - updated vk.xml - updated vulkan.hpp - updated vulkan_core.h
Diffstat (limited to 'include')
-rw-r--r--include/vulkan/vulkan.hpp99
-rw-r--r--include/vulkan/vulkan_core.h12
2 files changed, 27 insertions, 84 deletions
diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp
index 16cbbb4..1e4cf69 100644
--- a/include/vulkan/vulkan.hpp
+++ b/include/vulkan/vulkan.hpp
@@ -53,7 +53,24 @@
# include <cassert>
# define VULKAN_HPP_ASSERT assert
#endif
-static_assert( VK_HEADER_VERSION == 80 , "Wrong VK_HEADER_VERSION!" );
+
+// <tuple> includes <sys/sysmacros.h> through some other header
+// this results in major(x) being resolved to gnu_dev_major(x)
+// which is an expression in a constructor initializer list.
+#if defined(major)
+ #undef major
+#endif
+#if defined(minor)
+ #undef minor
+#endif
+
+// Windows defines MemoryBarrier which is deprecated and collides
+// with the vk::MemoryBarrier struct.
+#ifdef MemoryBarrier
+ #undef MemoryBarrier
+#endif
+
+static_assert( VK_HEADER_VERSION == 81 , "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
@@ -6982,27 +6999,6 @@ public:
struct RefreshCycleDurationGOOGLE
{
- RefreshCycleDurationGOOGLE( uint64_t refreshDuration_ = 0 )
- : refreshDuration( refreshDuration_ )
- {
- }
-
- RefreshCycleDurationGOOGLE( VkRefreshCycleDurationGOOGLE const & rhs )
- {
- memcpy( this, &rhs, sizeof( RefreshCycleDurationGOOGLE ) );
- }
-
- RefreshCycleDurationGOOGLE& operator=( VkRefreshCycleDurationGOOGLE const & rhs )
- {
- memcpy( this, &rhs, sizeof( RefreshCycleDurationGOOGLE ) );
- return *this;
- }
- RefreshCycleDurationGOOGLE& setRefreshDuration( uint64_t refreshDuration_ )
- {
- refreshDuration = refreshDuration_;
- return *this;
- }
-
operator const VkRefreshCycleDurationGOOGLE&() const
{
return *reinterpret_cast<const VkRefreshCycleDurationGOOGLE*>(this);
@@ -7024,59 +7020,6 @@ public:
struct PastPresentationTimingGOOGLE
{
- PastPresentationTimingGOOGLE( uint32_t presentID_ = 0,
- uint64_t desiredPresentTime_ = 0,
- uint64_t actualPresentTime_ = 0,
- uint64_t earliestPresentTime_ = 0,
- uint64_t presentMargin_ = 0 )
- : presentID( presentID_ )
- , desiredPresentTime( desiredPresentTime_ )
- , actualPresentTime( actualPresentTime_ )
- , earliestPresentTime( earliestPresentTime_ )
- , presentMargin( presentMargin_ )
- {
- }
-
- PastPresentationTimingGOOGLE( VkPastPresentationTimingGOOGLE const & rhs )
- {
- memcpy( this, &rhs, sizeof( PastPresentationTimingGOOGLE ) );
- }
-
- PastPresentationTimingGOOGLE& operator=( VkPastPresentationTimingGOOGLE const & rhs )
- {
- memcpy( this, &rhs, sizeof( PastPresentationTimingGOOGLE ) );
- return *this;
- }
- PastPresentationTimingGOOGLE& setPresentID( uint32_t presentID_ )
- {
- presentID = presentID_;
- return *this;
- }
-
- PastPresentationTimingGOOGLE& setDesiredPresentTime( uint64_t desiredPresentTime_ )
- {
- desiredPresentTime = desiredPresentTime_;
- return *this;
- }
-
- PastPresentationTimingGOOGLE& setActualPresentTime( uint64_t actualPresentTime_ )
- {
- actualPresentTime = actualPresentTime_;
- return *this;
- }
-
- PastPresentationTimingGOOGLE& setEarliestPresentTime( uint64_t earliestPresentTime_ )
- {
- earliestPresentTime = earliestPresentTime_;
- return *this;
- }
-
- PastPresentationTimingGOOGLE& setPresentMargin( uint64_t presentMargin_ )
- {
- presentMargin = presentMargin_;
- return *this;
- }
-
operator const VkPastPresentationTimingGOOGLE&() const
{
return *reinterpret_cast<const VkPastPresentationTimingGOOGLE*>(this);
@@ -25884,7 +25827,7 @@ public:
struct ValidationFlagsEXT
{
ValidationFlagsEXT( uint32_t disabledValidationCheckCount_ = 0,
- ValidationCheckEXT* pDisabledValidationChecks_ = nullptr )
+ const ValidationCheckEXT* pDisabledValidationChecks_ = nullptr )
: disabledValidationCheckCount( disabledValidationCheckCount_ )
, pDisabledValidationChecks( pDisabledValidationChecks_ )
{
@@ -25912,7 +25855,7 @@ public:
return *this;
}
- ValidationFlagsEXT& setPDisabledValidationChecks( ValidationCheckEXT* pDisabledValidationChecks_ )
+ ValidationFlagsEXT& setPDisabledValidationChecks( const ValidationCheckEXT* pDisabledValidationChecks_ )
{
pDisabledValidationChecks = pDisabledValidationChecks_;
return *this;
@@ -25942,7 +25885,7 @@ public:
public:
const void* pNext = nullptr;
uint32_t disabledValidationCheckCount;
- ValidationCheckEXT* pDisabledValidationChecks;
+ const ValidationCheckEXT* pDisabledValidationChecks;
};
static_assert( sizeof( ValidationFlagsEXT ) == sizeof( VkValidationFlagsEXT ), "struct and wrapper have different size!" );
diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h
index 06c8607..1f231e0 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 80
+#define VK_HEADER_VERSION 81
#define VK_NULL_HANDLE 0
@@ -6411,10 +6411,10 @@ typedef enum VkValidationCheckEXT {
} VkValidationCheckEXT;
typedef struct VkValidationFlagsEXT {
- VkStructureType sType;
- const void* pNext;
- uint32_t disabledValidationCheckCount;
- VkValidationCheckEXT* pDisabledValidationChecks;
+ VkStructureType sType;
+ const void* pNext;
+ uint32_t disabledValidationCheckCount;
+ const VkValidationCheckEXT* pDisabledValidationChecks;
} VkValidationFlagsEXT;
@@ -7732,7 +7732,7 @@ typedef struct VkPhysicalDeviceShaderCorePropertiesAMD {
#define VK_EXT_vertex_attribute_divisor 1
-#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 1
+#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 2
#define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor"
typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT {