mirror of
https://github.com/KhronosGroup/Vulkan-Hpp.git
synced 2024-10-14 16:32:17 +00:00
Bring back default arguments to ObjectDestroy class. Update header to Vulkan 1.130 (#468)
Fix issue #467
This commit is contained in:
parent
021c7499a0
commit
499d4bb33d
@ -1 +1 @@
|
||||
Subproject commit 6be1d00866a6d3bf8a1839b902d1de9e7065a4b8
|
||||
Subproject commit f63dd5c9d874310c8403f3aef9302b761efedd18
|
@ -1,4 +1,4 @@
|
||||
// Copyright(c) 2015-2019, NVIDIA CORPORATION. All rights reserved.
|
||||
// Copyright(c) 2015-2020, NVIDIA CORPORATION. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
@ -4559,7 +4559,7 @@ int main( int argc, char **argv )
|
||||
, m_dispatch( nullptr )
|
||||
{}
|
||||
|
||||
ObjectDestroy( OwnerType owner, Optional<const AllocationCallbacks> allocationCallbacks, Dispatch const &dispatch ) VULKAN_HPP_NOEXCEPT
|
||||
ObjectDestroy( OwnerType owner, Optional<const AllocationCallbacks> allocationCallbacks = nullptr, Dispatch const &dispatch = Dispatch() ) VULKAN_HPP_NOEXCEPT
|
||||
: m_owner( owner )
|
||||
, m_allocationCallbacks( allocationCallbacks )
|
||||
, m_dispatch( &dispatch )
|
||||
|
38
tests/UniqueHandleDefaultArguments/CMakeLists.txt
Normal file
38
tests/UniqueHandleDefaultArguments/CMakeLists.txt
Normal file
@ -0,0 +1,38 @@
|
||||
# Copyright(c) 2020, NVIDIA CORPORATION. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
cmake_minimum_required(VERSION 3.2)
|
||||
|
||||
project(UniqueHandleDefaultArguments)
|
||||
|
||||
set(HEADERS
|
||||
)
|
||||
|
||||
set(SOURCES
|
||||
UniqueHandleDefaultArguments.cpp
|
||||
)
|
||||
|
||||
source_group(headers FILES ${HEADERS})
|
||||
source_group(sources FILES ${SOURCES})
|
||||
|
||||
add_library(UniqueHandleDefaultArguments
|
||||
${HEADERS}
|
||||
${SOURCES}
|
||||
)
|
||||
|
||||
if (UNIX)
|
||||
target_link_libraries(UniqueHandleDefaultArguments "-ldl")
|
||||
endif()
|
||||
|
||||
set_target_properties(UniqueHandleDefaultArguments PROPERTIES FOLDER "Tests")
|
@ -0,0 +1,31 @@
|
||||
// Copyright(c) 2020, NVIDIA CORPORATION. All rights reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
// VulkanHpp Test: Compile only test for issue 467.
|
||||
|
||||
#define VULKAN_HPP_NO_EXCEPTIONS
|
||||
#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
|
||||
|
||||
#include "vulkan/vulkan.hpp"
|
||||
|
||||
VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE;
|
||||
|
||||
#if defined(__x86_64__) || defined(_M_X64)
|
||||
// On 32-bit systems the test is ambiguous.
|
||||
void test()
|
||||
{
|
||||
VkSurfaceKHR surface = 0;
|
||||
auto uniqueSurface = vk::UniqueSurfaceKHR(surface, vk::Instance());
|
||||
}
|
||||
#endif
|
1880
vulkan/vulkan.hpp
1880
vulkan/vulkan.hpp
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user