TheCloud/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2025-09-08 03:16:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Throw on clang_format failure; fix comment (#2070)

Browse Source
This commit is contained in:
Andreas Süßenbach 2025-02-11 09:35:35 +01:00 committed by GitHub
parent a854add3d8
commit 0ff63e9dc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.clang-format_14
View File

@ -44,7 +44,8 @@ BraceWrapping :
SplitEmptyNamespace : true SplitEmptyNamespace : true
BreakBeforeBinaryOperators : None BreakBeforeBinaryOperators : None
BreakBeforeBraces : Custom BreakBeforeBraces : Custom
BreakBeforeConceptDeclarations : true # This flag seems to be a boolean with clang-format 14 ?!? # BreakBeforeConceptDeclarations seems to be a boolean with clang-format 14 ?!?
BreakBeforeConceptDeclarations : true
BreakBeforeTernaryOperators : true BreakBeforeTernaryOperators : true
BreakConstructorInitializers : BeforeComma BreakConstructorInitializers : BeforeComma
BreakInheritanceList : BeforeComma BreakInheritanceList : BeforeComma

50
VulkanHppGenerator.cpp
View File

@ -3955,10 +3955,10 @@ std::string VulkanHppGenerator::generateCommandResultMultiSuccessWithErrors(
std::vector<size_t> returnParams = determineReturnParams( commandData.params ); std::vector<size_t> returnParams = determineReturnParams( commandData.params );
switch ( returnParams.size() ) switch ( returnParams.size() )
{ {
case 0: return generateCommandResultWithErrors0Return( name, commandData, initialSkipCount, definition, raii ); case 0 : return generateCommandResultWithErrors0Return( name, commandData, initialSkipCount, definition, raii );
case 1: return generateCommandResultMultiSuccessWithErrors1Return( name, commandData, initialSkipCount, definition, returnParams[0], raii ); case 1 : return generateCommandResultMultiSuccessWithErrors1Return( name, commandData, initialSkipCount, definition, returnParams[0], raii );
case 2: return generateCommandResultMultiSuccessWithErrors2Return( name, commandData, initialSkipCount, definition, returnParams, raii ); case 2 : return generateCommandResultMultiSuccessWithErrors2Return( name, commandData, initialSkipCount, definition, returnParams, raii );
case 3: return generateCommandResultMultiSuccessWithErrors3Return( name, commandData, initialSkipCount, definition, returnParams, raii ); case 3 : return generateCommandResultMultiSuccessWithErrors3Return( name, commandData, initialSkipCount, definition, returnParams, raii );
default: break; default: break;
} }
return ""; return "";
@ -4365,10 +4365,10 @@ std::string VulkanHppGenerator::generateCommandResultSingleSuccessWithErrors(
std::vector<size_t> returnParams = determineReturnParams( commandData.params ); std::vector<size_t> returnParams = determineReturnParams( commandData.params );
switch ( returnParams.size() ) switch ( returnParams.size() )
{ {
case 0: return generateCommandResultWithErrors0Return( name, commandData, initialSkipCount, definition, raii ); case 0 : return generateCommandResultWithErrors0Return( name, commandData, initialSkipCount, definition, raii );
case 1: return generateCommandResultSingleSuccessWithErrors1Return( name, commandData, initialSkipCount, definition, returnParams[0], raii ); case 1 : return generateCommandResultSingleSuccessWithErrors1Return( name, commandData, initialSkipCount, definition, returnParams[0], raii );
case 2: return generateCommandResultSingleSuccessWithErrors2Return( name, commandData, initialSkipCount, definition, returnParams, raii ); case 2 : return generateCommandResultSingleSuccessWithErrors2Return( name, commandData, initialSkipCount, definition, returnParams, raii );
case 3: return generateCommandResultSingleSuccessWithErrors3Return( name, commandData, initialSkipCount, definition, returnParams, raii ); case 3 : return generateCommandResultSingleSuccessWithErrors3Return( name, commandData, initialSkipCount, definition, returnParams, raii );
default: break; default: break;
} }
return ""; return "";
@ -4906,9 +4906,9 @@ std::string VulkanHppGenerator::generateCommandVoid(
std::vector<size_t> returnParams = determineReturnParams( commandData.params ); std::vector<size_t> returnParams = determineReturnParams( commandData.params );
switch ( returnParams.size() ) switch ( returnParams.size() )
{ {
case 0: return generateCommandVoid0Return( name, commandData, initialSkipCount, definition, raii ); case 0 : return generateCommandVoid0Return( name, commandData, initialSkipCount, definition, raii );
case 1: return generateCommandVoid1Return( name, commandData, initialSkipCount, definition, returnParams[0], raii ); case 1 : return generateCommandVoid1Return( name, commandData, initialSkipCount, definition, returnParams[0], raii );
case 2: return generateCommandVoid2Return( name, commandData, initialSkipCount, definition, returnParams, raii ); case 2 : return generateCommandVoid2Return( name, commandData, initialSkipCount, definition, returnParams, raii );
default: break; default: break;
} }
return ""; return "";
@ -7435,7 +7435,8 @@ std::string VulkanHppGenerator::generateEnum( std::pair<std::string, EnumData> c
typeTraits = generateLayerSettingTypeTraits(); typeTraits = generateLayerSettingTypeTraits();
} }
const std::string enumTemplate = R"( // wrapper class for enum Vk${enumName}, see https://registry.khronos.org/vulkan/specs/latest/man/html/Vk${enumName}.html const std::string enumTemplate =
R"( // wrapper class for enum Vk${enumName}, see https://registry.khronos.org/vulkan/specs/latest/man/html/Vk${enumName}.html
enum class ${enumName}${baseType}{${enumValues}}; enum class ${enumName}${baseType}{${enumValues}};
${typeTraits} ${typeTraits}
${enumUsing} ${enumUsing}
@ -10220,7 +10221,7 @@ std::pair<std::string, std::string> VulkanHppGenerator::generateRAIIHandleConstr
} }
} }
break; break;
case 2: return generateRAIIHandleConstructor1Return2Vector( handle, constructorIt, enter, leave, returnParams[0], vectorParams ); case 2 : return generateRAIIHandleConstructor1Return2Vector( handle, constructorIt, enter, leave, returnParams[0], vectorParams );
default: break; default: break;
} }
} }
@ -12257,7 +12258,8 @@ ${deprecatedConstructors}
compareOperators += generateStructCompareOperators( structure ); compareOperators += generateStructCompareOperators( structure );
} }
static const std::string structureTemplate = R"( // wrapper struct for struct Vk${structureType}, see https://registry.khronos.org/vulkan/specs/latest/man/html/Vk${structureType}.html static const std::string structureTemplate =
R"( // wrapper struct for struct Vk${structureType}, see https://registry.khronos.org/vulkan/specs/latest/man/html/Vk${structureType}.html
struct ${structureType} struct ${structureType}
{ {
using NativeType = Vk${structureType}; using NativeType = Vk${structureType};
@ -17103,17 +17105,17 @@ std::string VulkanHppGenerator::toString( TypeCategory category )
{ {
switch ( category ) switch ( category )
{ {
case TypeCategory::Bitmask: return "bitmask"; case TypeCategory::Bitmask : return "bitmask";
case TypeCategory::BaseType: return "basetype"; case TypeCategory::BaseType : return "basetype";
case TypeCategory::Define: return "define"; case TypeCategory::Define : return "define";
case TypeCategory::Enum: return "enum"; case TypeCategory::Enum : return "enum";
case TypeCategory::ExternalType: return "ExternalType"; case TypeCategory::ExternalType: return "ExternalType";
case TypeCategory::FuncPointer: return "funcpointer"; case TypeCategory::FuncPointer : return "funcpointer";
case TypeCategory::Handle: return "handle"; case TypeCategory::Handle : return "handle";
case TypeCategory::Struct: return "struct"; case TypeCategory::Struct : return "struct";
case TypeCategory::Union: return "union"; case TypeCategory::Union : return "union";
case TypeCategory::Unknown: return "unkown"; case TypeCategory::Unknown : return "unkown";
default: assert( false ); return ""; default : assert( false ); return "";
} }
} }

2
XMLHelper.hpp
View File

@ -570,7 +570,7 @@ void writeToFile( std::string const & str, std::string const & fileName )
const int ret = std::system( commandString.c_str() ); const int ret = std::system( commandString.c_str() );
if ( ret != 0 ) if ( ret != 0 )
{ {
messager.message( "VulkanHppGenerator: failed to format file " + fileName + " with error <" + std::to_string( ret ) + ">\n" ); throw std::runtime_error( "VulkanHppGenerator: failed to format file " + fileName + " with error <" + std::to_string( ret ) + ">" );
} }
#endif #endif
} }