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

Add tests for ArrayProxy constructors with raw arrays with size

Browse Source 
Add tests for new ArrayProxy and ArrayProxyNoTemporaries constructors.
Also add more size assertions, to verify that ArrayProxy size is correct
after construction.
This commit is contained in:
phantom10111 2022-04-15 17:38:23 +02:00
parent 5df998c0d6
commit 1bc663f851
2 changed files with 158 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
tests/ArrayProxy/ArrayProxy.cpp
View File

@ -52,6 +52,13 @@ int main( int /*argc*/, char ** /*argv*/ )
// fct(i1); // not supported: cannot convert argument 1 from 'const int' to 'vk::ArrayProxy<int>' // fct(i1); // not supported: cannot convert argument 1 from 'const int' to 'vk::ArrayProxy<int>'
fctc( i1 ); fctc( i1 );
vk::ArrayProxy<const int> ap1 = 1;
assert( ap1.size() == 1 );
vk::ArrayProxy<const int> ap2 = i0;
assert( ap2.size() == 1 );
vk::ArrayProxy<const int> ap3 = i1;
assert( ap3.size() == 1 );
// count, T * // count, T *
int * i0p = &i0; int * i0p = &i0;
fct( { 1, i0p } ); fct( { 1, i0p } );
@ -62,6 +69,26 @@ int main( int /*argc*/, char ** /*argv*/ )
// fct({ 1, i1p }); // not supported: cannot convert argument 1 from 'initializer list' to 'vk::ArrayProxy<int>' // fct({ 1, i1p }); // not supported: cannot convert argument 1 from 'initializer list' to 'vk::ArrayProxy<int>'
fctc( { 1, i1p } ); fctc( { 1, i1p } );
vk::ArrayProxy<const int> ap4 = { 1, i0p };
assert( ap4.size() == 1 );
vk::ArrayProxy<const int> ap5 = { 1, i1p };
assert( ap5.size() == 1 );
// T[count]
int ia0[2] = { 0, 1 };
fct( ia0 );
fctc( ia0 );
// const T[count]
const int ia1[2] = { 0, 1 };
// fct( ia1 ); // not supported: cannot convert argument 1 from 'const int [2]' to 'vk::ArrayProxy<int>'
fctc( ia1 );
vk::ArrayProxy<const int> ap6 = ia0;
assert( ap6.size() == 2 );
vk::ArrayProxy<const int> ap7 = ia1;
assert( ap7.size() == 2 );
// std::array<T,N> // std::array<T,N>
std::array<int, 2> sa0 = { 0, 1 }; std::array<int, 2> sa0 = { 0, 1 };
fct( sa0 ); fct( sa0 );
@ -80,20 +107,20 @@ int main( int /*argc*/, char ** /*argv*/ )
// fct(sa3); // not supported: cannot convert argument 1 from 'const std::array<const int,2>' to 'vk::ArrayProxy<int>' // fct(sa3); // not supported: cannot convert argument 1 from 'const std::array<const int,2>' to 'vk::ArrayProxy<int>'
fctc( sa3 ); fctc( sa3 );
vk::ArrayProxy<int> ap2 = sa0; vk::ArrayProxy<int> ap8 = sa0;
assert( ap2.size() == 2 );
// vk::ArrayProxy<int> ap3 = sa1; // not supported: cannot convert from 'std::array<const int,2>' to 'vk::ArrayProxy<int>'
// vk::ArrayProxy<int> ap4 = sa2; // not supported: cannot convert from '_Ty *' to 'T *'
// vk::ArrayProxy<int> ap5 = sa3; // not supported: cannot convert from 'const std::array<const int,2>' to 'vk::ArrayProxy<int>'
vk::ArrayProxy<const int> ap6 = sa0;
assert( ap6.size() == 2 );
vk::ArrayProxy<const int> ap7 = sa1;
assert( ap7.size() == 2 );
vk::ArrayProxy<const int> ap8 = sa2;
assert( ap8.size() == 2 ); assert( ap8.size() == 2 );
vk::ArrayProxy<const int> ap9 = sa3; // vk::ArrayProxy<int> ap9 = sa1; // not supported: cannot convert from 'std::array<const int,2>' to 'vk::ArrayProxy<int>'
assert( ap9.size() == 2 ); // vk::ArrayProxy<int> ap10 = sa2; // not supported: cannot convert from '_Ty *' to 'T *'
// vk::ArrayProxy<int> ap11 = sa3; // not supported: cannot convert from 'const std::array<const int,2>' to 'vk::ArrayProxy<int>'
vk::ArrayProxy<const int> ap12 = sa0;
assert( ap12.size() == 2 );
vk::ArrayProxy<const int> ap13 = sa1;
assert( ap13.size() == 2 );
vk::ArrayProxy<const int> ap14 = sa2;
assert( ap14.size() == 2 );
vk::ArrayProxy<const int> ap15 = sa3;
assert( ap15.size() == 2 );
// std::vector<T> // std::vector<T>
std::vector<int> sv0 = { 0, 1 }; std::vector<int> sv0 = { 0, 1 };
@ -104,14 +131,14 @@ int main( int /*argc*/, char ** /*argv*/ )
// fct(sv1); // not supported: cannot convert from 'const _Ty *' to 'T *' // fct(sv1); // not supported: cannot convert from 'const _Ty *' to 'T *'
fctc( sv1 ); fctc( sv1 );
vk::ArrayProxy<int> ap10 = sv0; vk::ArrayProxy<int> ap16 = sv0;
assert( ap10.size() == 2 ); assert( ap16.size() == 2 );
// vk::ArrayProxy<int> ap11 = sv1; // not supported: cannot convert from '_Ty *' to 'T *' // vk::ArrayProxy<int> ap17 = sv1; // not supported: cannot convert from '_Ty *' to 'T *'
vk::ArrayProxy<const int> ap12 = sv0; vk::ArrayProxy<const int> ap18 = sv0;
assert( ap12.size() == 2 ); assert( ap18.size() == 2 );
vk::ArrayProxy<const int> ap13 = sv1; vk::ArrayProxy<const int> ap19 = sv1;
assert( ap13.size() == 2 ); assert( ap19.size() == 2 );
// std::initializer_list // std::initializer_list
fct( {} ); fct( {} );
@ -145,19 +172,23 @@ int main( int /*argc*/, char ** /*argv*/ )
// fct(il4); // not supported: cannot convert argument 1 from 'const std::initializer_list<T>' to 'vk::ArrayProxy<int>' // fct(il4); // not supported: cannot convert argument 1 from 'const std::initializer_list<T>' to 'vk::ArrayProxy<int>'
fctc( il4 ); fctc( il4 );
// vk::ArrayProxy<int> ap14 = il1; // not supported: cannot convert from 'const _Elem *' to 'T *' // vk::ArrayProxy<int> ap20 = il1; // not supported: cannot convert from 'const _Elem *' to 'T *'
// vk::ArrayProxy<int> ap15 = il2; // not supported: cannot convert from 'std::initializer_list<T>' to 'vk::ArrayProxy<int>' // vk::ArrayProxy<int> ap21 = il2; // not supported: cannot convert from 'std::initializer_list<T>' to 'vk::ArrayProxy<int>'
// vk::ArrayProxy<int> ap16 = il3; // not supported: cannot convert from 'const _Elem *' to 'T *' // vk::ArrayProxy<int> ap22 = il3; // not supported: cannot convert from 'const _Elem *' to 'T *'
// vk::ArrayProxy<int> ap17 = il4; // not supported: cannot convert from 'const std::initializer_list<T>' to 'vk::ArrayProxy<int>' // vk::ArrayProxy<int> ap23 = il4; // not supported: cannot convert from 'const std::initializer_list<T>' to 'vk::ArrayProxy<int>'
vk::ArrayProxy<const int> ap18 = il1; vk::ArrayProxy<const int> ap24 = {};
assert( ap18.size() == 2 ); assert( ap24.size() == 0 );
vk::ArrayProxy<const int> ap19 = il2; vk::ArrayProxy<const int> ap25 = { 0, 1 };
assert( ap19.size() == 2 ); assert( ap25.size() == 2 );
vk::ArrayProxy<const int> ap20 = il3; vk::ArrayProxy<const int> ap26 = il1;
assert( ap20.size() == 2 ); assert( ap26.size() == 2 );
vk::ArrayProxy<const int> ap21 = il4; vk::ArrayProxy<const int> ap27 = il2;
assert( ap21.size() == 2 ); assert( ap27.size() == 2 );
vk::ArrayProxy<const int> ap28 = il3;
assert( ap28.size() == 2 );
vk::ArrayProxy<const int> ap29 = il4;
assert( ap29.size() == 2 );
#if defined( VULKAN_HPP_SUPPORT_SPAN ) #if defined( VULKAN_HPP_SUPPORT_SPAN )
// std::span<T, N> // std::span<T, N>
@ -177,6 +208,15 @@ int main( int /*argc*/, char ** /*argv*/ )
std::span<const int> const ss3( sa3.begin(), sa3.end() ); std::span<const int> const ss3( sa3.begin(), sa3.end() );
// fct(ss3); // not supported: cannot convert from 'const std::span<const int>' to 'vk::ArrayProxy<int>' // fct(ss3); // not supported: cannot convert from 'const std::span<const int>' to 'vk::ArrayProxy<int>'
fctc( ss3 ); fctc( ss3 );
vk::ArrayProxy<const int> ap30 = ss0;
assert( ap30.size() == 2 );
vk::ArrayProxy<const int> ap31 = ss1;
assert( ap31.size() == 2 );
vk::ArrayProxy<const int> ap32 = ss2;
assert( ap32.size() == 2 );
vk::ArrayProxy<const int> ap33 = ss3;
assert( ap33.size() == 2 );
#endif #endif
} }
catch ( vk::SystemError const & err ) catch ( vk::SystemError const & err )

120
tests/ArrayProxyNoTemporaries/ArrayProxyNoTemporaries.cpp
View File

@ -38,6 +38,18 @@ int getInt()
return 1; return 1;
} }
int( &&getArrayReference() )[2]
{
static int arr[2] = { 1, 2 };
return std::move( arr );
}
int const( &&getConstArrayReference() )[2]
{
static int const arr[2] = { 1, 2 };
return std::move( arr );
}
std::array<int, 2> getArray() std::array<int, 2> getArray()
{ {
return { 1, 2 }; return { 1, 2 };
@ -98,6 +110,13 @@ int main( int /*argc*/, char ** /*argv*/ )
// fct(i1); // not supported: ArrayProxyNoTemporaries<const int&>(const int &) // fct(i1); // not supported: ArrayProxyNoTemporaries<const int&>(const int &)
fctc( i1 ); fctc( i1 );
// vk::ArrayProxyNoTemporaries<const int> ap1 = 1; // not supported: ArrayProxyNoTemporaries<const int>::ArrayProxyNoTemporaries<T,0>(int &&)
vk::ArrayProxyNoTemporaries<const int> ap2 = i0;
assert( ap2.size() == 1 );
vk::ArrayProxyNoTemporaries<const int> ap3 = i1;
assert( ap3.size() == 1 );
// count, T * // count, T *
int * i0p = &i0; int * i0p = &i0;
fct( { 1, i0p } ); fct( { 1, i0p } );
@ -108,6 +127,32 @@ int main( int /*argc*/, char ** /*argv*/ )
// fct({ 1, i1p }); // not supported: cannot convert argument 1 from 'initializer list' to 'vk::ArrayProxyNoTemporaries<int>' // fct({ 1, i1p }); // not supported: cannot convert argument 1 from 'initializer list' to 'vk::ArrayProxyNoTemporaries<int>'
fctc( { 1, i1p } ); fctc( { 1, i1p } );
vk::ArrayProxyNoTemporaries<const int> ap4 = { 1, i0p };
assert( ap4.size() == 1 );
vk::ArrayProxyNoTemporaries<const int> ap5 = { 1, i1p };
assert( ap5.size() == 1 );
// T[count]
int ia0[2] = { 0, 1 };
fct( ia0 );
fctc( ia0 );
// const T[count]
const int ia1[2] = { 0, 1 };
// fct( ia1 ); // not supported: cannot convert argument 1 from 'const int [2]' to 'vk::ArrayProxyNoTemporaries<int>'
fctc( ia1 );
vk::ArrayProxyNoTemporaries<const int> ap6 = ia0;
assert( ap6.size() == 2 );
vk::ArrayProxyNoTemporaries<const int> ap7 = ia1;
assert( ap7.size() == 2 );
// getArrayReference
// fct( getConstArrayReference() ); // not supported
// fctc( getConstArrayReference() ); // not supported
// fct( getArrayReference() ); // not supported
// fctc( getArrayReference() ); // not supported
// std::array<T,N> // std::array<T,N>
std::array<int, 2> sa0 = { 0, 1 }; std::array<int, 2> sa0 = { 0, 1 };
fct( sa0 ); fct( sa0 );
@ -135,21 +180,22 @@ int main( int /*argc*/, char ** /*argv*/ )
// fctc( getArray() ); // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<std::array<int,2>>(V &&) // fctc( getArray() ); // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<std::array<int,2>>(V &&)
// from std::array constructors // from std::array constructors
vk::ArrayProxyNoTemporaries<int> ap2 = sa0; vk::ArrayProxyNoTemporaries<int> ap8 = sa0;
assert( ap2.size() == 2 ); assert( ap8.size() == 2 );
// vk::ArrayProxyNoTemporaries<int> ap3 = sa1; // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<std::array<const
// int,2>&>(V) vk::ArrayProxyNoTemporaries<int> ap4 = sa2; // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const // vk::ArrayProxyNoTemporaries<int> ap9 = sa1; // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<std::array<const
// std::array<int,2>&>(V) vk::ArrayProxyNoTemporaries<int> ap5 = sa3; // not supported: attempting to reference a deleted function: // int,2>&>(V) vk::ArrayProxyNoTemporaries<int> ap10 = sa2; // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const
// std::array<int,2>&>(V) vk::ArrayProxyNoTemporaries<int> ap11 = sa3; // not supported: attempting to reference a deleted function:
// ArrayProxyNoTemporaries<const std::array<const int,2>&>(V) // ArrayProxyNoTemporaries<const std::array<const int,2>&>(V)
vk::ArrayProxyNoTemporaries<const int> ap6 = sa0; vk::ArrayProxyNoTemporaries<const int> ap12 = sa0;
assert( ap6.size() == 2 ); assert( ap12.size() == 2 );
vk::ArrayProxyNoTemporaries<const int> ap7 = sa1; vk::ArrayProxyNoTemporaries<const int> ap13 = sa1;
assert( ap7.size() == 2 ); assert( ap13.size() == 2 );
vk::ArrayProxyNoTemporaries<const int> ap8 = sa2; vk::ArrayProxyNoTemporaries<const int> ap14 = sa2;
assert( ap8.size() == 2 ); assert( ap14.size() == 2 );
vk::ArrayProxyNoTemporaries<const int> ap9 = sa3; vk::ArrayProxyNoTemporaries<const int> ap15 = sa3;
assert( ap9.size() == 2 ); assert( ap15.size() == 2 );
// std::vector<T> // std::vector<T>
std::vector<int> sv0 = { 0, 1 }; std::vector<int> sv0 = { 0, 1 };
@ -161,11 +207,6 @@ int main( int /*argc*/, char ** /*argv*/ )
// fct(sv1); // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const std::vector<int,std::allocator<int>>&>(V) // fct(sv1); // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const std::vector<int,std::allocator<int>>&>(V)
fctc( sv1 ); fctc( sv1 );
vk::ArrayProxyNoTemporaries<int> ap10 = sv0;
assert( ap10.size() == 2 );
// vk::ArrayProxyNoTemporaries<int> ap11 = sv1; // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const
// std::vector<int,std::allocator<int>>&>(V)
// getVector // getVector
// fct( getConstVector() ); // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const // fct( getConstVector() ); // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const
// std::vector<int,std::allocator<int>>>(V &&) fctc( getConstVector() ); // not supported: attempting to reference a deleted function: // std::vector<int,std::allocator<int>>>(V &&) fctc( getConstVector() ); // not supported: attempting to reference a deleted function:
@ -173,10 +214,16 @@ int main( int /*argc*/, char ** /*argv*/ )
// function: ArrayProxyNoTemporaries<std::vector<int,std::allocator<int>>>(V &&) fctc( getVector() ); // not supported: attempting to reference a // function: ArrayProxyNoTemporaries<std::vector<int,std::allocator<int>>>(V &&) fctc( getVector() ); // not supported: attempting to reference a
// deleted function: ArrayProxyNoTemporaries<std::vector<int,std::allocator<int>>>(V &&) // deleted function: ArrayProxyNoTemporaries<std::vector<int,std::allocator<int>>>(V &&)
vk::ArrayProxyNoTemporaries<const int> ap12 = sv0; vk::ArrayProxyNoTemporaries<int> ap16 = sv0;
assert( ap12.size() == 2 ); assert( ap16.size() == 2 );
vk::ArrayProxyNoTemporaries<const int> ap13 = sv1;
assert( ap13.size() == 2 ); // vk::ArrayProxyNoTemporaries<int> ap17 = sv1; // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const
// std::vector<int,std::allocator<int>>&>(V)
vk::ArrayProxyNoTemporaries<const int> ap18 = sv0;
assert( ap18.size() == 2 );
vk::ArrayProxyNoTemporaries<const int> ap19 = sv1;
assert( ap19.size() == 2 );
// std::initializer_list // std::initializer_list
fct( {} ); fct( {} );
@ -217,20 +264,25 @@ int main( int /*argc*/, char ** /*argv*/ )
// deleted function: ArrayProxyNoTemporaries(std::initializer_list<int> &&) fctc( getInitializerList() ); // not supported: attempting to reference // deleted function: ArrayProxyNoTemporaries(std::initializer_list<int> &&) fctc( getInitializerList() ); // not supported: attempting to reference
// a deleted function: ArrayProxyNoTemporaries<T,0>(std::initializer_list<int> &&) // a deleted function: ArrayProxyNoTemporaries<T,0>(std::initializer_list<int> &&)
// vk::ArrayProxyNoTemporaries<int> ap14 = il1; // not supported: cannot convert from 'const int *' to 'int *' // vk::ArrayProxyNoTemporaries<int> ap20 = il1; // not supported: cannot convert from 'const int *' to 'int *'
// vk::ArrayProxyNoTemporaries<int> ap15 = il2; // not supported: attempting to reference a deleted function: // vk::ArrayProxyNoTemporaries<int> ap21 = il2; // not supported: attempting to reference a deleted function:
// ArrayProxyNoTemporaries<std::initializer_list<T>&>(V) vk::ArrayProxyNoTemporaries<int> ap16 = il3; // not supported: cannot convert from 'const int *' // ArrayProxyNoTemporaries<std::initializer_list<T>&>(V) vk::ArrayProxyNoTemporaries<int> ap22 = il3; // not supported: cannot convert from 'const int *'
// to 'int *' vk::ArrayProxyNoTemporaries<int> ap17 = il4; // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const // to 'int *' vk::ArrayProxyNoTemporaries<int> ap23 = il4; // not supported: attempting to reference a deleted function: ArrayProxyNoTemporaries<const
// std::initializer_list<T>&>(V) // std::initializer_list<T>&>(V)
vk::ArrayProxyNoTemporaries<const int> ap18 = il1; vk::ArrayProxyNoTemporaries<const int> ap24 = {};
assert( ap18.size() == 2 ); assert( ap24.size() == 0 );
vk::ArrayProxyNoTemporaries<const int> ap19 = il2;
assert( ap19.size() == 2 ); //vk::ArrayProxyNoTemporaries<const int> ap25 = { 0, 1 }; // not supported
vk::ArrayProxyNoTemporaries<const int> ap20 = il3;
assert( ap20.size() == 2 ); vk::ArrayProxyNoTemporaries<const int> ap26 = il1;
vk::ArrayProxyNoTemporaries<const int> ap21 = il4; assert( ap26.size() == 2 );
assert( ap21.size() == 2 ); vk::ArrayProxyNoTemporaries<const int> ap27 = il2;
assert( ap27.size() == 2 );
vk::ArrayProxyNoTemporaries<const int> ap28 = il3;
assert( ap28.size() == 2 );
vk::ArrayProxyNoTemporaries<const int> ap29 = il4;
assert( ap29.size() == 2 );
} }
catch ( vk::SystemError const & err ) catch ( vk::SystemError const & err )
{ {