mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Silent warnings on unused variables in some tests; make test UniqueHandleDefaultArguments part of the solution for 64 bit only. (#1704)

Browse Source
This commit is contained in:
Andreas Süßenbach 2023-10-18 13:45:14 +02:00 committed by GitHub
parent 5b6f6faf7a
commit 3e0d722ca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/ArrayProxy/ArrayProxy.cpp
View File

@ -15,6 +15,16 @@
// VulkanHpp Samples : ArrayProxy // VulkanHpp Samples : ArrayProxy
// Compile test on using vk::ArrayProxy // Compile test on using vk::ArrayProxy
#if defined( _MSC_VER )
// no need to ignore any warnings with MSVC
#elif defined( __clang__ )
# pragma clang diagnostic ignored "-Wunused-variable"
#elif defined( __GNUC__ )
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#else
// unknow compiler... just ignore the warnings for yourselves ;)
#endif
#include <iostream> #include <iostream>
#include <vulkan/vulkan.hpp> #include <vulkan/vulkan.hpp>
#if ( 20 <= VULKAN_HPP_CPP_VERSION ) #if ( 20 <= VULKAN_HPP_CPP_VERSION )

16
tests/ArrayProxyNoTemporaries/ArrayProxyNoTemporaries.cpp
View File

@ -69,15 +69,15 @@ std::vector<int> const getConstVector()
return { 1, 2 }; return { 1, 2 };
} }
std::initializer_list<int> getInitializerList() //std::initializer_list<int> getInitializerList()
{ //{
return { 1, 2 }; // return { 1, 2 };
} //}
std::initializer_list<int> const getConstInitializerList() //std::initializer_list<int> const getConstInitializerList()
{ //{
return { 1, 2 }; // return { 1, 2 };
} //}
int main( int /*argc*/, char ** /*argv*/ ) int main( int /*argc*/, char ** /*argv*/ )
{ {

8
tests/CMakeLists.txt
View File

@ -15,6 +15,9 @@
add_subdirectory( ArrayProxy ) add_subdirectory( ArrayProxy )
add_subdirectory( ArrayProxyNoTemporaries ) add_subdirectory( ArrayProxyNoTemporaries )
add_subdirectory( ArrayWrapper ) add_subdirectory( ArrayWrapper )
if( VULKAN_HPP_ENABLE_CPP20_MODULES )
add_subdirectory( Cpp20Modules )
endif()
add_subdirectory( DesignatedInitializers ) add_subdirectory( DesignatedInitializers )
add_subdirectory( DeviceFunctions ) add_subdirectory( DeviceFunctions )
add_subdirectory( DispatchLoaderDynamic ) add_subdirectory( DispatchLoaderDynamic )
@ -31,7 +34,6 @@ add_subdirectory( NoExceptions )
add_subdirectory( StridedArrayProxy ) add_subdirectory( StridedArrayProxy )
add_subdirectory( StructureChain ) add_subdirectory( StructureChain )
add_subdirectory( UniqueHandle ) add_subdirectory( UniqueHandle )
add_subdirectory( UniqueHandleDefaultArguments ) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
if( VULKAN_HPP_ENABLE_CPP20_MODULES ) add_subdirectory( UniqueHandleDefaultArguments )
add_subdirectory( Cpp20Modules )
endif() endif()

10
tests/StridedArrayProxy/StridedArrayProxy.cpp
View File

@ -15,6 +15,16 @@
// VulkanHpp Samples : StridedArrayProxy // VulkanHpp Samples : StridedArrayProxy
// Compile test on using vk::StridedArrayProxy // Compile test on using vk::StridedArrayProxy
#if defined( _MSC_VER )
// no need to ignore any warnings with MSVC
#elif defined( __clang__ )
# pragma clang diagnostic ignored "-Wunused-variable"
#elif defined( __GNUC__ )
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#else
// unknow compiler... just ignore the warnings for yourselves ;)
#endif
#include <iostream> #include <iostream>
#include <vulkan/vulkan.hpp> #include <vulkan/vulkan.hpp>
#if ( 20 <= VULKAN_HPP_CPP_VERSION ) #if ( 20 <= VULKAN_HPP_CPP_VERSION )

5
tests/UniqueHandleDefaultArguments/UniqueHandleDefaultArguments.cpp
View File

@ -14,6 +14,8 @@
// //
// VulkanHpp Test: Compile only test for issue 467. // VulkanHpp Test: Compile only test for issue 467.
// Should be used on 64 bit only, as on 32 bit the test is ambiguous.
#define VULKAN_HPP_NO_EXCEPTIONS #define VULKAN_HPP_NO_EXCEPTIONS
#define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1 #define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
@ -21,12 +23,9 @@
VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
#if defined( __x86_64__ ) || defined( _M_X64 )
// On 32-bit systems the test is ambiguous.
int main( int /*argc*/, char ** /*argv*/ ) int main( int /*argc*/, char ** /*argv*/ )
{ {
VkSurfaceKHR surface = 0; VkSurfaceKHR surface = 0;
auto uniqueSurface = vk::UniqueSurfaceKHR( surface, vk::Instance() ); auto uniqueSurface = vk::UniqueSurfaceKHR( surface, vk::Instance() );
return 0; return 0;
} }
#endif