AuroraMiddleware/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp synced 2024-11-23 04:30:05 +00:00
Code Issues Releases Wiki Activity

Make logical operators on flags constexpr. (#407)

Browse Source
This commit is contained in:
Andreas Süßenbach 2019-10-10 13:29:59 +02:00 committed by Markus Tavenrath
parent 7f51d1a724
commit f379a11a69
2 changed files with 2127 additions and 739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
VulkanHppGenerator.cpp
View File

@ -835,16 +835,6 @@ void VulkanHppGenerator::appendBitmask(std::string & str, std::string const& bit
} }
static const std::string bitmaskOperatorsTemplate = R"( static const std::string bitmaskOperatorsTemplate = R"(
VULKAN_HPP_INLINE ${bitmaskName} operator|( ${enumName} bit0, ${enumName} bit1 )
{
return ${bitmaskName}( bit0 ) | bit1;
}
VULKAN_HPP_INLINE ${bitmaskName} operator~( ${enumName} bits )
{
return ~( ${bitmaskName}( bits ) );
}
template <> struct FlagTraits<${enumName}> template <> struct FlagTraits<${enumName}>
{ {
enum enum
@ -852,6 +842,36 @@ void VulkanHppGenerator::appendBitmask(std::string & str, std::string const& bit
allFlags = ${allFlags} allFlags = ${allFlags}
}; };
}; };
VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR ${bitmaskName} operator|( ${enumName} bit0, ${enumName} bit1 )
{
return ${bitmaskName}( bit0 ) | bit1;
}
VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR ${bitmaskName} operator&( ${enumName} bit0, ${enumName} bit1 )
{
return ${bitmaskName}( bit0 ) & bit1;
}
VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR ${bitmaskName} operator^( ${enumName} bit0, ${enumName} bit1 )
{
return ${bitmaskName}( bit0 ) ^ bit1;
}
VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR ${bitmaskName} operator~( ${enumName} bits )
{
return ~( ${bitmaskName}( bits ) );
}
VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR bool operator==( ${enumName} bit0, ${enumName} bit1 )
{
return ${bitmaskName}( bit0 ) == bit1;
}
VULKAN_HPP_INLINE VULKAN_HPP_CONSTEXPR bool operator!=( ${enumName} bit0, ${enumName} bit1 )
{
return ${bitmaskName}( bit0 ) != bit1;
}
)"; )";
str += replaceWithMap(bitmaskOperatorsTemplate, { { "bitmaskName", bitmaskName },{ "enumName", enumName },{ "allFlags", allFlags } }); str += replaceWithMap(bitmaskOperatorsTemplate, { { "bitmaskName", bitmaskName },{ "enumName", enumName },{ "allFlags", allFlags } });
@ -4475,55 +4495,47 @@ int main( int argc, char **argv )
return *this; return *this;
} }
Flags<BitType> operator|(Flags<BitType> const& rhs) const VULKAN_HPP_CONSTEXPR Flags<BitType> operator|(Flags<BitType> const& rhs) const
{ {
Flags<BitType> result(*this); return Flags<BitType>(m_mask | rhs.m_mask);
result |= rhs;
return result;
} }
Flags<BitType> operator&(Flags<BitType> const& rhs) const VULKAN_HPP_CONSTEXPR Flags<BitType> operator&(Flags<BitType> const& rhs) const
{ {
Flags<BitType> result(*this); return Flags<BitType>(m_mask & rhs.m_mask);
result &= rhs;
return result;
} }
Flags<BitType> operator^(Flags<BitType> const& rhs) const VULKAN_HPP_CONSTEXPR Flags<BitType> operator^(Flags<BitType> const& rhs) const
{ {
Flags<BitType> result(*this); return Flags<BitType>(m_mask ^ rhs.m_mask);
result ^= rhs;
return result;
} }
bool operator!() const VULKAN_HPP_CONSTEXPR bool operator!() const
{ {
return !m_mask; return !m_mask;
} }
Flags<BitType> operator~() const VULKAN_HPP_CONSTEXPR Flags<BitType> operator~() const
{ {
Flags<BitType> result(*this); return Flags<BitType>(m_mask ^ FlagTraits<BitType>::allFlags);
result.m_mask ^= FlagTraits<BitType>::allFlags;
return result;
} }
bool operator==(Flags<BitType> const& rhs) const VULKAN_HPP_CONSTEXPR bool operator==(Flags<BitType> const& rhs) const
{ {
return m_mask == rhs.m_mask; return m_mask == rhs.m_mask;
} }
bool operator!=(Flags<BitType> const& rhs) const VULKAN_HPP_CONSTEXPR bool operator!=(Flags<BitType> const& rhs) const
{ {
return m_mask != rhs.m_mask; return m_mask != rhs.m_mask;
} }
explicit operator bool() const explicit VULKAN_HPP_CONSTEXPR operator bool() const
{ {
return !!m_mask; return !!m_mask;
} }
explicit operator MaskType() const explicit VULKAN_HPP_CONSTEXPR operator MaskType() const
{ {
return m_mask; return m_mask;
} }
@ -4533,22 +4545,34 @@ int main( int argc, char **argv )
}; };
template <typename BitType> template <typename BitType>
Flags<BitType> operator|(BitType bit, Flags<BitType> const& flags) VULKAN_HPP_CONSTEXPR Flags<BitType> operator|(BitType bit, Flags<BitType> const& flags)
{ {
return flags | bit; return flags | bit;
} }
template <typename BitType> template <typename BitType>
Flags<BitType> operator&(BitType bit, Flags<BitType> const& flags) VULKAN_HPP_CONSTEXPR Flags<BitType> operator&(BitType bit, Flags<BitType> const& flags)
{ {
return flags & bit; return flags & bit;
} }
template <typename BitType> template <typename BitType>
Flags<BitType> operator^(BitType bit, Flags<BitType> const& flags) VULKAN_HPP_CONSTEXPR Flags<BitType> operator^(BitType bit, Flags<BitType> const& flags)
{ {
return flags ^ bit; return flags ^ bit;
} }
template <typename BitType>
VULKAN_HPP_CONSTEXPR bool operator==(BitType bit, Flags<BitType> const& flags)
{
return flags == bit;
}
template <typename BitType>
VULKAN_HPP_CONSTEXPR bool operator!=(BitType bit, Flags<BitType> const& flags)
{
return flags != bit;
}
)"; )";
static const std::string classObjectDestroy = R"( static const std::string classObjectDestroy = R"(
@ -5378,7 +5402,7 @@ namespace std
str += "} // namespace VULKAN_HPP_NAMESPACE\n" str += "} // namespace VULKAN_HPP_NAMESPACE\n"
"#endif\n"; "#endif\n";
//assert(str.length() < estimatedLength); assert(str.length() < estimatedLength);
cleanup(str); cleanup(str);
std::ofstream ofs(VULKAN_HPP_FILE); std::ofstream ofs(VULKAN_HPP_FILE);

2772
vulkan/vulkan.hpp
View File

File diff suppressed because it is too large Load Diff