[HPP] Replace some asserts to VULKAN_HPP_ASSERT_ON_RESULT

This commit is contained in:
mocabe 2020-06-25 21:19:01 +09:00
parent f0767988c9
commit ec562ec33a
2 changed files with 12 additions and 12 deletions

View File

@ -8089,7 +8089,7 @@ namespace std
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore(message); ignore(message);
VULKAN_HPP_ASSERT( result == Result::eSuccess ); VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
return result; return result;
#else #else
if ( result != Result::eSuccess ) if ( result != Result::eSuccess )
@ -8104,7 +8104,7 @@ namespace std
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore(message); ignore(message);
VULKAN_HPP_ASSERT( result == Result::eSuccess ); VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
return ResultValue<T>( result, std::move( data ) ); return ResultValue<T>( result, std::move( data ) );
#else #else
if ( result != Result::eSuccess ) if ( result != Result::eSuccess )
@ -8119,7 +8119,7 @@ namespace std
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore(message); ignore(message);
VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() ); VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
#else #else
if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() ) if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
{ {
@ -8134,7 +8134,7 @@ namespace std
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore(message); ignore(message);
VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() ); VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
#else #else
if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() ) if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
{ {
@ -8150,7 +8150,7 @@ namespace std
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore(message); ignore(message);
VULKAN_HPP_ASSERT( result == Result::eSuccess ); VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
return ResultValue<UniqueHandle<T,D>>( result, UniqueHandle<T,D>(data, deleter) ); return ResultValue<UniqueHandle<T,D>>( result, UniqueHandle<T,D>(data, deleter) );
#else #else
if ( result != Result::eSuccess ) if ( result != Result::eSuccess )
@ -8166,7 +8166,7 @@ namespace std
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore(message); ignore(message);
VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() ); VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
return ResultValue<UniqueHandle<T,D>>( result, UniqueHandle<T,D>(data, deleter) ); return ResultValue<UniqueHandle<T,D>>( result, UniqueHandle<T,D>(data, deleter) );
#else #else
if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() ) if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )

View File

@ -16128,7 +16128,7 @@ namespace VULKAN_HPP_NAMESPACE
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore( message ); ignore( message );
VULKAN_HPP_ASSERT( result == Result::eSuccess ); VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
return result; return result;
#else #else
if ( result != Result::eSuccess ) if ( result != Result::eSuccess )
@ -16143,7 +16143,7 @@ namespace VULKAN_HPP_NAMESPACE
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore( message ); ignore( message );
VULKAN_HPP_ASSERT( result == Result::eSuccess ); VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
return ResultValue<T>( result, std::move( data ) ); return ResultValue<T>( result, std::move( data ) );
#else #else
if ( result != Result::eSuccess ) if ( result != Result::eSuccess )
@ -16160,7 +16160,7 @@ namespace VULKAN_HPP_NAMESPACE
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore( message ); ignore( message );
VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() ); VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
#else #else
if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() ) if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
{ {
@ -16176,7 +16176,7 @@ namespace VULKAN_HPP_NAMESPACE
{ {
#ifdef VULKAN_HPP_NO_EXCEPTIONS #ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore( message ); ignore( message );
VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() ); VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
#else #else
if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() ) if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )
{ {
@ -16193,7 +16193,7 @@ namespace VULKAN_HPP_NAMESPACE
{ {
# ifdef VULKAN_HPP_NO_EXCEPTIONS # ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore( message ); ignore( message );
VULKAN_HPP_ASSERT( result == Result::eSuccess ); VULKAN_HPP_ASSERT_ON_RESULT( result == Result::eSuccess );
return ResultValue<UniqueHandle<T, D>>( result, UniqueHandle<T, D>( data, deleter ) ); return ResultValue<UniqueHandle<T, D>>( result, UniqueHandle<T, D>( data, deleter ) );
# else # else
if ( result != Result::eSuccess ) if ( result != Result::eSuccess )
@ -16214,7 +16214,7 @@ namespace VULKAN_HPP_NAMESPACE
{ {
# ifdef VULKAN_HPP_NO_EXCEPTIONS # ifdef VULKAN_HPP_NO_EXCEPTIONS
ignore( message ); ignore( message );
VULKAN_HPP_ASSERT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() ); VULKAN_HPP_ASSERT_ON_RESULT( std::find( successCodes.begin(), successCodes.end(), result ) != successCodes.end() );
return ResultValue<UniqueHandle<T, D>>( result, UniqueHandle<T, D>( data, deleter ) ); return ResultValue<UniqueHandle<T, D>>( result, UniqueHandle<T, D>( data, deleter ) );
# else # else
if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() ) if ( std::find( successCodes.begin(), successCodes.end(), result ) == successCodes.end() )