mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix gcc/clang includes and warnings

Browse Source
This commit is contained in:
Markus Tavenrath
2016-07-26 16:09:41 +02:00
parent 6740df4faf
commit a31b910628
2 changed files with 75 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
VulkanHppGenerator.cpp
View File

@@ -222,6 +222,7 @@ std::string const optionalClassHeader = (
);
std::string const arrayProxyHeader = (
"#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE\n"
" template <typename T>\n"
" class ArrayProxy\n"
" {\n"
@@ -311,6 +312,7 @@ std::string const arrayProxyHeader = (
" uint32_t m_count;\n"
" T * m_ptr;\n"
" };\n"
"#endif\n"
"\n"
);
@@ -524,7 +526,7 @@ struct StructData
{}
bool returnedOnly;
bool isUnion;
bool isUnion;
std::vector<MemberData> members;
std::string protect;
};
@@ -1457,7 +1459,7 @@ void readTypeStruct( tinyxml2::XMLElement * element, VkData & vkData )
assert( vkData.structs.find( name ) == vkData.structs.end() );
std::map<std::string,StructData>::iterator it = vkData.structs.insert( std::make_pair( name, StructData() ) ).first;
it->second.returnedOnly = !!element->Attribute( "returnedonly" );
it->second.isUnion = false;
it->second.isUnion = false;
tinyxml2::XMLElement * child = element->FirstChildElement();
do
@@ -1559,7 +1561,7 @@ void readTypeUnion( tinyxml2::XMLElement * element, VkData & vkData )
assert( vkData.structs.find( name ) == vkData.structs.end() );
std::map<std::string,StructData>::iterator it = vkData.structs.insert( std::make_pair( name, StructData() ) ).first;
it->second.isUnion = true;
it->second.isUnion = true;
tinyxml2::XMLElement * child = element->FirstChildElement();
do
@@ -2337,14 +2339,14 @@ void writeStructConstructor( std::ofstream & ofs, std::string const& name, Struc
}
else
{
ofs << "std::array<" + structData.members[i].type + "," + structData.members[i].arraySize + "> const& " + structData.members[i].name << "_ = { " << defaultIt->second;
ofs << "std::array<" + structData.members[i].type + "," + structData.members[i].arraySize + "> const& " + structData.members[i].name << "_ = { { " << defaultIt->second;
size_t n = atoi(structData.members[i].arraySize.c_str());
assert(0 < n);
for (size_t j = 1; j < n; j++)
{
ofs << ", " << defaultIt->second;
}
ofs << " }";
ofs << " } }";
}
listedArgument = true;
}
@@ -2736,21 +2738,21 @@ void writeTypeScalar( std::ofstream & ofs, DependencyData const& dependencyData
<< std::endl;
}
bool containsUnion(std::string const& type, std::map<std::string, StructData> const& structs)
{
std::map<std::string, StructData>::const_iterator sit = structs.find(type);
bool found = (sit != structs.end());
if (found)
{
found = sit->second.isUnion;
for (std::vector<MemberData>::const_iterator mit = sit->second.members.begin(); mit != sit->second.members.end() && !found; ++mit)
{
found = (mit->type == mit->pureType) && containsUnion(mit->type, structs);
}
}
return found;
}
bool containsUnion(std::string const& type, std::map<std::string, StructData> const& structs)
{
std::map<std::string, StructData>::const_iterator sit = structs.find(type);
bool found = (sit != structs.end());
if (found)
{
found = sit->second.isUnion;
for (std::vector<MemberData>::const_iterator mit = sit->second.members.begin(); mit != sit->second.members.end() && !found; ++mit)
{
found = (mit->type == mit->pureType) && containsUnion(mit->type, structs);
}
}
return found;
}
void writeTypeStruct( std::ofstream & ofs, VkData const& vkData, DependencyData const& dependencyData, std::map<std::string,std::string> const& defaultValues )
{
std::map<std::string,StructData>::const_iterator it = vkData.structs.find( dependencyData.name );
@@ -2782,42 +2784,38 @@ void writeTypeStruct( std::ofstream & ofs, VkData const& vkData, DependencyData
<< " }" << std::endl
<< std::endl;
// operator==() and operator!=()
// only structs without a union as a member can have a meaningfull == and != operation; we filter them out
if (!containsUnion(dependencyData.name, vkData.structs))
{
ofs << " bool operator==( " << dependencyData.name << " const& rhs ) const" << std::endl
<< " {" << std::endl
<< " return ";
for (size_t i = 0; i < it->second.members.size(); i++)
{
if (i != 0)
{
ofs << std::endl << " && ";
}
if (!it->second.members[i].arraySize.empty())
{
ofs << "( memcmp( " << it->second.members[i].name << ", rhs." << it->second.members[i].name << ", " << it->second.members[i].arraySize << " * sizeof( " << it->second.members[i].type << " ) ) == 0 )";
}
else
{
ofs << "( " << it->second.members[i].name << " == rhs." << it->second.members[i].name << " )";
}
}
ofs << ";" << std::endl
<< " }" << std::endl
<< std::endl
<< " bool operator!=( " << dependencyData.name << " const& rhs ) const" << std::endl
<< " {" << std::endl
<< " return !operator==( rhs );" << std::endl
<< " }" << std::endl
<< std::endl;
}
else
{
int a = 0;
}
// operator==() and operator!=()
// only structs without a union as a member can have a meaningfull == and != operation; we filter them out
if (!containsUnion(dependencyData.name, vkData.structs))
{
ofs << " bool operator==( " << dependencyData.name << " const& rhs ) const" << std::endl
<< " {" << std::endl
<< " return ";
for (size_t i = 0; i < it->second.members.size(); i++)
{
if (i != 0)
{
ofs << std::endl << " && ";
}
if (!it->second.members[i].arraySize.empty())
{
ofs << "( memcmp( " << it->second.members[i].name << ", rhs." << it->second.members[i].name << ", " << it->second.members[i].arraySize << " * sizeof( " << it->second.members[i].type << " ) ) == 0 )";
}
else
{
ofs << "( " << it->second.members[i].name << " == rhs." << it->second.members[i].name << " )";
}
}
ofs << ";" << std::endl
<< " }" << std::endl
<< std::endl
<< " bool operator!=( " << dependencyData.name << " const& rhs ) const" << std::endl
<< " {" << std::endl
<< " return !operator==( rhs );" << std::endl
<< " }" << std::endl
<< std::endl;
}
// the member variables
for (size_t i = 0; i < it->second.members.size(); i++)
{
@@ -2839,9 +2837,9 @@ void writeTypeStruct( std::ofstream & ofs, VkData const& vkData, DependencyData
ofs << ";" << std::endl;
}
}
ofs << " };" << std::endl
<< " static_assert( sizeof( " << dependencyData.name << " ) == sizeof( Vk" << dependencyData.name << " ), \"struct and wrapper have different size!\" );" << std::endl;
ofs << " };" << std::endl
<< " static_assert( sizeof( " << dependencyData.name << " ) == sizeof( Vk" << dependencyData.name << " ), \"struct and wrapper have different size!\" );" << std::endl;
leaveProtect(ofs, it->second.protect);
ofs << std::endl;
}
@@ -2877,7 +2875,7 @@ void writeTypeUnion( std::ofstream & ofs, VkData const& vkData, DependencyData c
}
else
{
ofs << " = { " << it->second << " }";
ofs << " = { {" << it->second << "} }";
}
}
ofs << " )" << std::endl
@@ -3081,14 +3079,18 @@ int main( int argc, char **argv )
<< "#ifndef VULKAN_HPP" << std::endl
<< "#define VULKAN_HPP" << std::endl
<< std::endl
<< "#include <algorithm>" << std::endl
<< "#include <array>" << std::endl
<< "#include <cassert>" << std::endl
<< "#include <cstdint>" << std::endl
<< "#include <cstring>" << std::endl
<< "#include <initializer_list>" << std::endl
<< "#include <string>" << std::endl
<< "#include <system_error>" << std::endl
<< "#include <type_traits>" << std::endl
<< "#include <vulkan/vulkan.h>" << std::endl
<< "#ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE" << std::endl
<< "# include <memory>" << std::endl
<< "# include <vector>" << std::endl
<< "#endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/" << std::endl
<< std::endl;
@@ -3131,12 +3133,14 @@ int main( int argc, char **argv )
<< std::endl
<< "#endif" << std::endl;
}
catch (std::exception e)
catch (std::exception const& e)
{
std::cout << "caught exception: " << e.what() << std::endl;
return -1;
}
catch (...)
{
std::cout << "caught unknown exception" << std::endl;
return -1;
}
}