Skip to content

Commit

Permalink
Update for Vulkan-Docs 1.2.165
Browse files Browse the repository at this point in the history
  • Loading branch information
oddhack committed Dec 14, 2020
1 parent fe98507 commit 85470b3
Show file tree
Hide file tree
Showing 4 changed files with 453 additions and 110 deletions.
55 changes: 20 additions & 35 deletions include/vulkan/vulkan.hpp
Expand Up @@ -94,7 +94,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h
#endif


static_assert( VK_HEADER_VERSION == 164 , "Wrong VK_HEADER_VERSION!" );
static_assert( VK_HEADER_VERSION == 165 , "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
Expand Down Expand Up @@ -3686,36 +3686,6 @@ namespace VULKAN_HPP_NAMESPACE
Dispatch const * m_dispatch = nullptr;
};

template <typename OwnerType, typename Dispatch>
class ObjectReleaseExt
{
public:
ObjectReleaseExt() = default;

ObjectReleaseExt( OwnerType owner, Dispatch const & dispatch = VULKAN_HPP_DEFAULT_DISPATCHER ) VULKAN_HPP_NOEXCEPT
: m_owner( owner )
, m_dispatch( &dispatch )
{}

OwnerType getOwner() const VULKAN_HPP_NOEXCEPT
{
return m_owner;
}

protected:
template <typename T>
void destroy( T t ) VULKAN_HPP_NOEXCEPT
{
VULKAN_HPP_ASSERT( m_owner && m_dispatch );
m_owner.releaseExt( t, *m_dispatch );
}

private:
OwnerType m_owner = {};
Dispatch const * m_dispatch = nullptr;
};


template <typename OwnerType, typename PoolType, typename Dispatch>
class PoolFree
{
Expand Down Expand Up @@ -15268,11 +15238,11 @@ namespace VULKAN_HPP_NAMESPACE
: type( type_ ), flags( flags_ ), mode( mode_ ), srcAccelerationStructure( srcAccelerationStructure_ ), dstAccelerationStructure( dstAccelerationStructure_ ), geometryCount( static_cast<uint32_t>( geometries_.size() ) ), pGeometries( geometries_.data() ), ppGeometries( pGeometries_.data() ), scratchData( scratchData_ )
{
#ifdef VULKAN_HPP_NO_EXCEPTIONS
VULKAN_HPP_ASSERT( geometries_.size() == pGeometries_.size() );
VULKAN_HPP_ASSERT( geometries_.empty() || pGeometries_.empty() || ( geometries_.size() == pGeometries_.size() ) );
#else
if ( geometries_.size() != pGeometries_.size() )
if ( !geometries_.empty() && !pGeometries_.empty() && ( geometries_.size() != pGeometries_.size() ) )
{
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::AccelerationStructureBuildGeometryInfoKHR::AccelerationStructureBuildGeometryInfoKHR: geometries_.size() != pGeometries_.size()" );
throw LogicError( VULKAN_HPP_NAMESPACE_STRING "::AccelerationStructureBuildGeometryInfoKHR::AccelerationStructureBuildGeometryInfoKHR: !geometries_.empty() && !pGeometries_.empty() && ( geometries_.size() != pGeometries_.size() )" );
}
#endif /*VULKAN_HPP_NO_EXCEPTIONS*/
}
Expand Down Expand Up @@ -29607,6 +29577,12 @@ namespace VULKAN_HPP_NAMESPACE
{
*this = rhs;
}

#if !defined(VULKAN_HPP_DISABLE_ENHANCED_MODE)
DescriptorSetAllocateInfo( VULKAN_HPP_NAMESPACE::DescriptorPool descriptorPool_, VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayout> const & setLayouts_ )
: descriptorPool( descriptorPool_ ), descriptorSetCount( static_cast<uint32_t>( setLayouts_.size() ) ), pSetLayouts( setLayouts_.data() )
{}
#endif // !defined(VULKAN_HPP_DISABLE_ENHANCED_MODE)
#endif // !defined( VULKAN_HPP_NO_STRUCT_CONSTRUCTORS )

DescriptorSetAllocateInfo & operator=( VkDescriptorSetAllocateInfo const & rhs ) VULKAN_HPP_NOEXCEPT
Expand Down Expand Up @@ -29645,6 +29621,15 @@ namespace VULKAN_HPP_NAMESPACE
return *this;
}

#if !defined(VULKAN_HPP_DISABLE_ENHANCED_MODE)
DescriptorSetAllocateInfo & setSetLayouts( VULKAN_HPP_NAMESPACE::ArrayProxyNoTemporaries<const VULKAN_HPP_NAMESPACE::DescriptorSetLayout> const & setLayouts_ ) VULKAN_HPP_NOEXCEPT
{
descriptorSetCount = static_cast<uint32_t>( setLayouts_.size() );
pSetLayouts = setLayouts_.data();
return *this;
}
#endif // !defined(VULKAN_HPP_DISABLE_ENHANCED_MODE)


operator VkDescriptorSetAllocateInfo const&() const VULKAN_HPP_NOEXCEPT
{
Expand Down Expand Up @@ -92171,7 +92156,7 @@ namespace VULKAN_HPP_NAMESPACE
{
VULKAN_HPP_NAMESPACE::DisplayKHR display;
Result result = static_cast<Result>( d.vkGetWinrtDisplayNV( m_physicalDevice, deviceRelativeId, reinterpret_cast<VkDisplayKHR *>( &display ) ) );
ObjectReleaseExt<PhysicalDevice, Dispatch> deleter( *this, d );
ObjectRelease<PhysicalDevice, Dispatch> deleter( *this, d );
return createResultValue<VULKAN_HPP_NAMESPACE::DisplayKHR, Dispatch>( result, display, VULKAN_HPP_NAMESPACE_STRING "::PhysicalDevice::getWinrtDisplayNVUnique", deleter );
}
# endif /*VULKAN_HPP_NO_SMART_HANDLE*/
Expand Down
2 changes: 1 addition & 1 deletion include/vulkan/vulkan_core.h
Expand Up @@ -43,7 +43,7 @@ extern "C" {
#define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0)// Patch version should always be set to 0

// Version of this file
#define VK_HEADER_VERSION 164
#define VK_HEADER_VERSION 165

// Complete version of this file
#define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION)
Expand Down

2 comments on commit 85470b3

@kloczek
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any plans to release sdk version?
Looks like Vulkan-Loader-sdk-1.2.162.0 build fails with latest sdk version of the Vulkan-Headers 1.2.154.0

[  7%] Building C object loader/CMakeFiles/asm_offset.dir/asm_offset.c.o
cd /home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/x86_64-redhat-linux-gnu/loader && /usr/bin/gcc -DAPI_NAME=\"Vulkan\" -DFALLBACK_CONFIG_DIRS=\"/etc/xdg\" -DFALLBACK_DATA_DIRS=\"/usr/share\" -DHAVE_CET_H -DSYSCONFDIR=\"/etc\" -DVK_ENABLE_BETA_EXTENSIONS -DVK_USE_PLATFORM_WAYLAND_KHR -DVK_USE_PLATFORM_XCB_KHR -DVK_USE_PLATFORM_XLIB_KHR -DVK_USE_PLATFORM_XLIB_XRANDR_EXT -D_XOPEN_SOURCE=500 -I/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader -I/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated -I/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/x86_64-redhat-linux-gnu/loader -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -flto=auto -flto-partition=none -fdata-sections -ffunction-sections -std=c99 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -fno-strict-aliasing -fno-builtin-memcmp -Wno-stringop-truncation -Wno-stringop-overflow -Wimplicit-fallthrough=0 -fvisibility=hidden -Wpointer-arith -O2 -g -DNDEBUG -o CMakeFiles/asm_offset.dir/asm_offset.c.o -c /home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/asm_offset.c
In file included from /home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/loader.h:38,
                 from /home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/asm_offset.c:24:
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:158:5: error: unknown type name 'PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR'
  158 |     PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR GetPhysicalDeviceFragmentShadingRatesKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:513:5: error: unknown type name 'PFN_vkCmdSetFragmentShadingRateKHR'
  513 |     PFN_vkCmdSetFragmentShadingRateKHR CmdSetFragmentShadingRateKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:728:5: error: unknown type name 'PFN_vkCmdSetFragmentShadingRateEnumNV'
  728 |     PFN_vkCmdSetFragmentShadingRateEnumNV CmdSetFragmentShadingRateEnumNV;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:733:5: error: unknown type name 'PFN_vkCmdBuildAccelerationStructuresKHR'
  733 |     PFN_vkCmdBuildAccelerationStructuresKHR CmdBuildAccelerationStructuresKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:734:5: error: unknown type name 'PFN_vkCmdBuildAccelerationStructuresIndirectKHR'
  734 |     PFN_vkCmdBuildAccelerationStructuresIndirectKHR CmdBuildAccelerationStructuresIndirectKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:735:5: error: unknown type name 'PFN_vkBuildAccelerationStructuresKHR'
  735 |     PFN_vkBuildAccelerationStructuresKHR BuildAccelerationStructuresKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:746:5: error: unknown type name 'PFN_vkGetAccelerationStructureBuildSizesKHR'
  746 |     PFN_vkGetAccelerationStructureBuildSizesKHR GetAccelerationStructureBuildSizesKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:753:5: error: unknown type name 'PFN_vkGetRayTracingShaderGroupStackSizeKHR'
  753 |     PFN_vkGetRayTracingShaderGroupStackSizeKHR GetRayTracingShaderGroupStackSizeKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_layer_dispatch_table.h:754:5: error: unknown type name 'PFN_vkCmdSetRayTracingPipelineStackSizeKHR'
  754 |     PFN_vkCmdSetRayTracingPipelineStackSizeKHR CmdSetRayTracingPipelineStackSizeKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/loader.h:39,
                 from /home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/asm_offset.c:24:
/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/loader/generated/vk_loader_extensions.h:338:5: error: unknown type name 'PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR'
  338 |     PFN_vkGetPhysicalDeviceFragmentShadingRatesKHR GetPhysicalDeviceFragmentShadingRatesKHR;
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
gmake[2]: *** [loader/CMakeFiles/asm_offset.dir/build.make:85: loader/CMakeFiles/asm_offset.dir/asm_offset.c.o] Error 1
gmake[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/x86_64-redhat-linux-gnu'
gmake[1]: *** [CMakeFiles/Makefile2:250: loader/CMakeFiles/asm_offset.dir/all] Error 2
gmake[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/Vulkan-Loader-sdk-1.2.162.0/x86_64-redhat-linux-gnu'
gmake: *** [Makefile:163: all] Error 2

@dgkoch
Copy link

@dgkoch dgkoch commented on 85470b3 Dec 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 1.2.162.0 SDK was just released this morning.

Please sign in to comment.