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

Merge pull request #514 from asuessenbach/arrayCopy

Browse Source 
Extend ConstExpression2DArrayCopy to support const T src[N][M].
This commit is contained in:
Andreas Süßenbach 2020-02-19 19:03:51 +01:00 committed by GitHub
commit 9514dde998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
VulkanHppGenerator.cpp
View File

@ -5422,14 +5422,14 @@ static const std::string constExpressionArrayCopy = R"(
public: public:
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], std::array<T,N> const& src) VULKAN_HPP_NOEXCEPT VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], std::array<T,N> const& src) VULKAN_HPP_NOEXCEPT
{ {
dst[I-1] = src[I-1];
ConstExpression1DArrayCopy<T, N, I - 1>::copy(dst, src); ConstExpression1DArrayCopy<T, N, I - 1>::copy(dst, src);
dst[I-1] = src[I-1];
} }
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], const T src[N]) VULKAN_HPP_NOEXCEPT VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], const T src[N]) VULKAN_HPP_NOEXCEPT
{ {
dst[I - 1] = src[I - 1];
ConstExpression1DArrayCopy<T, N, I - 1>::copy(dst, src); ConstExpression1DArrayCopy<T, N, I - 1>::copy(dst, src);
dst[I - 1] = src[I - 1];
} }
}; };
@ -5447,8 +5447,14 @@ static const std::string constExpressionArrayCopy = R"(
public: public:
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N][M], std::array<std::array<T,M>, N> const& src) VULKAN_HPP_NOEXCEPT VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N][M], std::array<std::array<T,M>, N> const& src) VULKAN_HPP_NOEXCEPT
{ {
dst[I - 1][J - 1] = src[I - 1][J - 1];
ConstExpression2DArrayCopy<T, N, M, I, J - 1>::copy(dst, src); ConstExpression2DArrayCopy<T, N, M, I, J - 1>::copy(dst, src);
dst[I - 1][J - 1] = src[I - 1][J - 1];
}
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N][M], const T src[N][M]) VULKAN_HPP_NOEXCEPT
{
ConstExpression2DArrayCopy<T, N, M, I, J - 1>::copy(dst, src);
dst[I - 1][J - 1] = src[I - 1][J - 1];
} }
}; };
@ -5460,6 +5466,11 @@ static const std::string constExpressionArrayCopy = R"(
{ {
ConstExpression2DArrayCopy<T, N, M, I - 1, M>::copy(dst, src); ConstExpression2DArrayCopy<T, N, M, I - 1, M>::copy(dst, src);
} }
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N][M], const T src[N][M]) VULKAN_HPP_NOEXCEPT
{
ConstExpression2DArrayCopy<T, N, M, I - 1, M>::copy(dst, src);
}
}; };
template <typename T, size_t N, size_t M> template <typename T, size_t N, size_t M>
@ -5467,6 +5478,7 @@ static const std::string constExpressionArrayCopy = R"(
{ {
public: public:
VULKAN_HPP_CONSTEXPR_14 static void copy(T /*dst*/[N][M], std::array<std::array<T, M>, N> const& /*src*/) VULKAN_HPP_NOEXCEPT {} VULKAN_HPP_CONSTEXPR_14 static void copy(T /*dst*/[N][M], std::array<std::array<T, M>, N> const& /*src*/) VULKAN_HPP_NOEXCEPT {}
VULKAN_HPP_CONSTEXPR_14 static void copy(T /*dst*/[N][M], const T /*src*/[N][M]) VULKAN_HPP_NOEXCEPT {}
}; };
)"; )";

18
vulkan/vulkan.hpp
View File

@ -2865,14 +2865,14 @@ namespace VULKAN_HPP_NAMESPACE
public: public:
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], std::array<T,N> const& src) VULKAN_HPP_NOEXCEPT VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], std::array<T,N> const& src) VULKAN_HPP_NOEXCEPT
{ {
dst[I-1] = src[I-1];
ConstExpression1DArrayCopy<T, N, I - 1>::copy(dst, src); ConstExpression1DArrayCopy<T, N, I - 1>::copy(dst, src);
dst[I-1] = src[I-1];
} }
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], const T src[N]) VULKAN_HPP_NOEXCEPT VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N], const T src[N]) VULKAN_HPP_NOEXCEPT
{ {
dst[I - 1] = src[I - 1];
ConstExpression1DArrayCopy<T, N, I - 1>::copy(dst, src); ConstExpression1DArrayCopy<T, N, I - 1>::copy(dst, src);
dst[I - 1] = src[I - 1];
} }
}; };
@ -2890,8 +2890,14 @@ namespace VULKAN_HPP_NAMESPACE
public: public:
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N][M], std::array<std::array<T,M>, N> const& src) VULKAN_HPP_NOEXCEPT VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N][M], std::array<std::array<T,M>, N> const& src) VULKAN_HPP_NOEXCEPT
{ {
dst[I - 1][J - 1] = src[I - 1][J - 1];
ConstExpression2DArrayCopy<T, N, M, I, J - 1>::copy(dst, src); ConstExpression2DArrayCopy<T, N, M, I, J - 1>::copy(dst, src);
dst[I - 1][J - 1] = src[I - 1][J - 1];
}
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N][M], const T src[N][M]) VULKAN_HPP_NOEXCEPT
{
ConstExpression2DArrayCopy<T, N, M, I, J - 1>::copy(dst, src);
dst[I - 1][J - 1] = src[I - 1][J - 1];
} }
}; };
@ -2903,6 +2909,11 @@ namespace VULKAN_HPP_NAMESPACE
{ {
ConstExpression2DArrayCopy<T, N, M, I - 1, M>::copy(dst, src); ConstExpression2DArrayCopy<T, N, M, I - 1, M>::copy(dst, src);
} }
VULKAN_HPP_CONSTEXPR_14 static void copy(T dst[N][M], const T src[N][M]) VULKAN_HPP_NOEXCEPT
{
ConstExpression2DArrayCopy<T, N, M, I - 1, M>::copy(dst, src);
}
}; };
template <typename T, size_t N, size_t M> template <typename T, size_t N, size_t M>
@ -2910,6 +2921,7 @@ namespace VULKAN_HPP_NAMESPACE
{ {
public: public:
VULKAN_HPP_CONSTEXPR_14 static void copy(T /*dst*/[N][M], std::array<std::array<T, M>, N> const& /*src*/) VULKAN_HPP_NOEXCEPT {} VULKAN_HPP_CONSTEXPR_14 static void copy(T /*dst*/[N][M], std::array<std::array<T, M>, N> const& /*src*/) VULKAN_HPP_NOEXCEPT {}
VULKAN_HPP_CONSTEXPR_14 static void copy(T /*dst*/[N][M], const T /*src*/[N][M]) VULKAN_HPP_NOEXCEPT {}
}; };
using Bool32 = uint32_t; using Bool32 = uint32_t;