ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Test: use Containers::arrayView() and arrayCast() to simplify code.

pull/200/head
Vladimír Vondruš 9 years ago
parent
30fa9645c1
commit
46e118879f
14 changed files with 252 additions and 253 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Magnum/DebugTools/Test/BufferDataGLTest.cpp
  2. 28
      src/Magnum/DebugTools/Test/TextureImageGLTest.cpp
  3. 6
      src/Magnum/Math/Test/FrustumTest.cpp
  4. 5
      src/Magnum/Test/AbstractShaderProgramGLTest.cpp
  5. 9
      src/Magnum/Test/BufferGLTest.cpp
  6. 24
      src/Magnum/Test/BufferImageGLTest.cpp
  7. 65
      src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
  8. 81
      src/Magnum/Test/CubeMapTextureGLTest.cpp
  9. 26
      src/Magnum/Test/PixelStorageGLTest.cpp
  10. 22
      src/Magnum/Test/RectangleTextureGLTest.cpp
  11. 83
      src/Magnum/Test/TextureArrayGLTest.cpp
  12. 140
      src/Magnum/Test/TextureGLTest.cpp
  13. 4
      src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
  14. 6
      src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp

6
src/Magnum/DebugTools/Test/BufferDataGLTest.cpp
Unescape View File

@ -51,8 +51,7 @@ void BufferDataGLTest::data() {
buffer.setData(Data, BufferUsage::StaticDraw); buffer.setData(Data, BufferUsage::StaticDraw);
const Containers::Array<Int> contents = bufferData<Int>(buffer); const Containers::Array<Int> contents = bufferData<Int>(buffer);
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS(contents, CORRADE_COMPARE_AS(contents, Containers::arrayView(Data),
Containers::ArrayView<const Int>{Data},
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -61,8 +60,7 @@ void BufferDataGLTest::subData() {
buffer.setData(Data, BufferUsage::StaticDraw); buffer.setData(Data, BufferUsage::StaticDraw);
const Containers::Array<Int> contents = bufferSubData<Int>(buffer, 4, 3); const Containers::Array<Int> contents = bufferSubData<Int>(buffer, 4, 3);
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS(contents, CORRADE_COMPARE_AS(contents, Containers::arrayView(Data).slice(1, 4),
Containers::ArrayView<const Int>{Data}.slice(1, 4),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }

28
src/Magnum/DebugTools/Test/TextureImageGLTest.cpp
Unescape View File

@ -92,10 +92,8 @@ void TextureImageGLTest::subImage2D() {
Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::RGBA, PixelType::UnsignedByte}); Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::RGBA, PixelType::UnsignedByte});
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(Data2D), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data2D},
TestSuite::Compare::Container);
} }
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
@ -107,8 +105,7 @@ void TextureImageGLTest::subImage2DBuffer() {
Containers::Array<UnsignedByte> data = bufferData<UnsignedByte>(image.buffer()); Containers::Array<UnsignedByte> data = bufferData<UnsignedByte>(image.buffer());
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS(data, CORRADE_COMPARE_AS(data, Containers::arrayView(Data2D),
Containers::ArrayView<const UnsignedByte>{Data2D},
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif
@ -127,10 +124,8 @@ void TextureImageGLTest::subImageCube() {
Image2D image = textureSubImage(texture, CubeMapCoordinate::PositiveX, 0, {{}, Vector2i{2}}, {PixelFormat::RGBA, PixelType::UnsignedByte}); Image2D image = textureSubImage(texture, CubeMapCoordinate::PositiveX, 0, {{}, Vector2i{2}}, {PixelFormat::RGBA, PixelType::UnsignedByte});
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(Data2D), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data2D},
TestSuite::Compare::Container);
} }
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
@ -149,8 +144,7 @@ void TextureImageGLTest::subImageCubeBuffer() {
Containers::Array<UnsignedByte> data = bufferData<UnsignedByte>(image.buffer()); Containers::Array<UnsignedByte> data = bufferData<UnsignedByte>(image.buffer());
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS(data, CORRADE_COMPARE_AS(data, Containers::arrayView(Data2D),
Containers::ArrayView<const UnsignedByte>{Data2D},
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif
@ -170,9 +164,8 @@ void TextureImageGLTest::subImage2DUInt() {
Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::RedInteger, PixelType::UnsignedInt}); Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::RedInteger, PixelType::UnsignedInt});
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedInt>(image.data()),
(Containers::ArrayView<const UnsignedInt>{image.data<UnsignedInt>(), image.data().size()/4}), Containers::arrayView(Data2DUInt),
Containers::ArrayView<const UnsignedInt>{Data2DUInt},
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -191,9 +184,8 @@ void TextureImageGLTest::subImage2DFloat() {
Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::Red, PixelType::Float}); Image2D image = textureSubImage(texture, 0, {{}, Vector2i{2}}, {PixelFormat::Red, PixelType::Float});
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<Float>(image.data()),
(Containers::ArrayView<const Float>{image.data<Float>(), image.data().size()/4}), Containers::arrayView(Data2DFloat),
Containers::ArrayView<const Float>{Data2DFloat},
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif

6
src/Magnum/Math/Test/FrustumTest.cpp
Unescape View File

@ -115,7 +115,7 @@ void FrustumTest::construct() {
planes[2], planes[3], planes[2], planes[3],
planes[4], planes[5]}; planes[4], planes[5]};
CORRADE_COMPARE_AS(frustum.planes(), Corrade::Containers::ArrayView<const Vector4>(planes), CORRADE_COMPARE_AS(frustum.planes(), Corrade::Containers::arrayView(planes),
Corrade::TestSuite::Compare::Container); Corrade::TestSuite::Compare::Container);
CORRADE_VERIFY((std::is_nothrow_constructible<Frustum, Vector4, Vector4, Vector4, Vector4, Vector4, Vector4>::value)); CORRADE_VERIFY((std::is_nothrow_constructible<Frustum, Vector4, Vector4, Vector4, Vector4, Vector4, Vector4>::value));
@ -248,8 +248,8 @@ void FrustumTest::convert() {
CORRADE_COMPARE(c, b); CORRADE_COMPARE(c, b);
constexpr Frstm d(b); constexpr Frstm d(b);
CORRADE_COMPARE_AS(Corrade::Containers::ArrayView<const Float>{d.data}, CORRADE_COMPARE_AS(Corrade::Containers::arrayView(d.data),
(Corrade::Containers::ArrayView<const Float>{a.data}), Corrade::Containers::arrayView(a.data),
Corrade::TestSuite::Compare::Container); Corrade::TestSuite::Compare::Container);
/* Implicit conversion is not allowed */ /* Implicit conversion is not allowed */

5
src/Magnum/Test/AbstractShaderProgramGLTest.cpp
Unescape View File

@ -715,9 +715,8 @@ void AbstractShaderProgramGLTest::compute() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<const Color4ub>(data),
(Corrade::Containers::ArrayView<const Color4ub>{reinterpret_cast<const Color4ub*>(data.data()), 4}), Containers::arrayView(outData),
(Corrade::Containers::ArrayView<const Color4ub>{outData}),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }

9
src/Magnum/Test/BufferGLTest.cpp
Unescape View File

@ -235,8 +235,7 @@ void BufferGLTest::data() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
const Containers::Array<Int> contents = buffer.data<Int>(); const Containers::Array<Int> contents = buffer.data<Int>();
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS(contents, CORRADE_COMPARE_AS(contents, Containers::arrayView(data),
Containers::ArrayView<const Int>{data},
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
@ -262,8 +261,7 @@ void BufferGLTest::data() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
const Containers::Array<Int> subContents = buffer.subData<Int>(4, 3); const Containers::Array<Int> subContents = buffer.subData<Int>(4, 3);
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS(subContents, CORRADE_COMPARE_AS(subContents, Containers::arrayView(subData),
Containers::ArrayView<const Int>{subData},
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -411,8 +409,7 @@ void BufferGLTest::copy() {
/** @todo How to verify the contents in ES? */ /** @todo How to verify the contents in ES? */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
const Containers::Array<char> subContents = buffer2.subData<char>(2, 3); const Containers::Array<char> subContents = buffer2.subData<char>(2, 3);
CORRADE_COMPARE_AS(subContents, CORRADE_COMPARE_AS(subContents, Containers::arrayView(data).slice(1, 4),
Containers::ArrayView<const char>{data}.slice(1, 4),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }

24
src/Magnum/Test/BufferImageGLTest.cpp
Unescape View File

@ -85,8 +85,8 @@ void BufferImageGLTest::construct() {
/** @todo How to verify the contents in ES? */ /** @todo How to verify the contents in ES? */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const char>{data}, CORRADE_COMPARE_AS(imageData, Containers::arrayView(data),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -114,8 +114,8 @@ void BufferImageGLTest::constructCompressed() {
/** @todo How to verify the contents in ES? */ /** @todo How to verify the contents in ES? */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const char>{data}, CORRADE_COMPARE_AS(imageData, Containers::arrayView(data),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -143,8 +143,8 @@ void BufferImageGLTest::constructBuffer() {
/** @todo How to verify the contents in ES? */ /** @todo How to verify the contents in ES? */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const char>{data}, CORRADE_COMPARE_AS(imageData, Containers::arrayView(data),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -178,8 +178,8 @@ void BufferImageGLTest::constructBufferCompressed() {
/** @todo How to verify the contents in ES? */ /** @todo How to verify the contents in ES? */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const char>{data}, CORRADE_COMPARE_AS(imageData, Containers::arrayView(data),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -299,8 +299,8 @@ void BufferImageGLTest::setData() {
/** @todo How to verify the contents in ES? */ /** @todo How to verify the contents in ES? */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedShort>{data2}, CORRADE_COMPARE_AS(imageData, Containers::arrayView(data2),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -330,8 +330,8 @@ void BufferImageGLTest::setDataCompressed() {
/** @todo How to verify the contents in ES? */ /** @todo How to verify the contents in ES? */
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const char>{data2}, CORRADE_COMPARE_AS(imageData, Containers::arrayView(data2),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }

65
src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
Unescape View File

@ -465,9 +465,8 @@ void CubeMapTextureArrayGLTest::image() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6)); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(DataOffset)), Containers::arrayView(Data), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container);
#endif #endif
} }
@ -497,9 +496,8 @@ void CubeMapTextureArrayGLTest::compressedImage() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedDataOffset)), Containers::arrayView(CompressedData), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container);
#endif #endif
} }
@ -526,8 +524,8 @@ void CubeMapTextureArrayGLTest::imageBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6)); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6));
CORRADE_COMPARE_AS(imageData.suffix(DataOffset), CORRADE_COMPARE_AS(imageData.suffix(DataOffset), Containers::arrayView(Data),
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -560,7 +558,7 @@ void CubeMapTextureArrayGLTest::compressedImageBuffer() {
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6}));
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset), CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset),
Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container); Containers::arrayView(CompressedData), TestSuite::Compare::Container);
#endif #endif
} }
@ -717,9 +715,8 @@ void CubeMapTextureArrayGLTest::subImage() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(4, 4, 6)); CORRADE_COMPARE(image.size(), Vector3i(4, 4, 6));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(SubDataComplete), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{SubDataComplete}, TestSuite::Compare::Container);
#endif #endif
} }
@ -751,9 +748,9 @@ void CubeMapTextureArrayGLTest::compressedSubImage() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{12, 12, 6})); CORRADE_COMPARE(image.size(), (Vector3i{12, 12, 6}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedSubDataComplete),
Containers::ArrayView<const UnsignedByte>{CompressedSubDataComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif
@ -779,9 +776,9 @@ void CubeMapTextureArrayGLTest::compressedSubImage() {
CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia),
"Non-default compressed pixel storage for cube map textures behaves weirdly on NVidia for client-memory images"); "Non-default compressed pixel storage for cube map textures behaves weirdly on NVidia for client-memory images");
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedSubDataComplete),
Containers::ArrayView<const UnsignedByte>{CompressedSubDataComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif
} }
@ -811,7 +808,8 @@ void CubeMapTextureArrayGLTest::subImageBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(4, 4, 6)); CORRADE_COMPARE(image.size(), Vector3i(4, 4, 6));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{SubDataComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubDataComplete),
TestSuite::Compare::Container);
#endif #endif
} }
@ -845,7 +843,8 @@ void CubeMapTextureArrayGLTest::compressedSubImageBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{12, 12, 6})); CORRADE_COMPARE(image.size(), (Vector3i{12, 12, 6}));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedSubDataComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubDataComplete),
TestSuite::Compare::Container);
#endif #endif
} }
@ -868,9 +867,8 @@ void CubeMapTextureArrayGLTest::subImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(2, 2, 4)); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 4));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(SubDataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(SubDataOffset)), Containers::arrayView(SubData), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{SubData}, TestSuite::Compare::Container);
} }
void CubeMapTextureArrayGLTest::compressedSubImageQuery() { void CubeMapTextureArrayGLTest::compressedSubImageQuery() {
@ -895,9 +893,9 @@ void CubeMapTextureArrayGLTest::compressedSubImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i{4}); CORRADE_COMPARE(image.size(), Vector3i{4});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedSubData),
Containers::ArrayView<const UnsignedByte>{CompressedSubData}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 1}, Vector3i{4}), {_compressedSubDataStorage}); CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 1}, Vector3i{4}), {_compressedSubDataStorage});
@ -905,9 +903,9 @@ void CubeMapTextureArrayGLTest::compressedSubImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i{4}); CORRADE_COMPARE(image.size(), Vector3i{4});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedSubDataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedSubDataOffset)), Containers::arrayView(CompressedSubData),
Containers::ArrayView<const UnsignedByte>{CompressedSubData}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
void CubeMapTextureArrayGLTest::subImageQueryBuffer() { void CubeMapTextureArrayGLTest::subImageQueryBuffer() {
@ -930,7 +928,7 @@ void CubeMapTextureArrayGLTest::subImageQueryBuffer() {
CORRADE_COMPARE(image.size(), Vector3i(2, 2, 4)); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 4));
CORRADE_COMPARE_AS(imageData.suffix(SubDataOffset), CORRADE_COMPARE_AS(imageData.suffix(SubDataOffset),
Containers::ArrayView<const UnsignedByte>{SubData}, TestSuite::Compare::Container); Containers::arrayView(SubData), TestSuite::Compare::Container);
} }
void CubeMapTextureArrayGLTest::compressedSubImageQueryBuffer() { void CubeMapTextureArrayGLTest::compressedSubImageQueryBuffer() {
@ -956,7 +954,8 @@ void CubeMapTextureArrayGLTest::compressedSubImageQueryBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i{4}); CORRADE_COMPARE(image.size(), Vector3i{4});
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedSubData}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubData),
TestSuite::Compare::Container);
} }
CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 1}, Vector3i{4}), {_compressedSubDataStorage}, BufferUsage::StaticRead); CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 1}, Vector3i{4}), {_compressedSubDataStorage}, BufferUsage::StaticRead);
@ -965,7 +964,9 @@ void CubeMapTextureArrayGLTest::compressedSubImageQueryBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i{4}); CORRADE_COMPARE(image.size(), Vector3i{4});
CORRADE_COMPARE_AS(imageData.suffix(_compressedSubDataOffset), Containers::ArrayView<const UnsignedByte>{CompressedSubData}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData.suffix(_compressedSubDataOffset),
Containers::arrayView(CompressedSubData),
TestSuite::Compare::Container);
} }
#endif #endif

81
src/Magnum/Test/CubeMapTextureGLTest.cpp
Unescape View File

@ -483,9 +483,8 @@ void CubeMapTextureGLTest::image() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE(image.size(), Vector2i(2));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_dataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_dataOffset)), Containers::arrayView(Data), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container);
#endif #endif
} }
@ -520,9 +519,8 @@ void CubeMapTextureGLTest::compressedImage() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}).suffix(_compressedDataOffset), Containers::arrayView(CompressedData), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container);
#endif #endif
} }
@ -544,7 +542,7 @@ void CubeMapTextureGLTest::imageBuffer() {
CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE(image.size(), Vector2i(2));
CORRADE_COMPARE_AS(imageData.suffix(_dataOffset), CORRADE_COMPARE_AS(imageData.suffix(_dataOffset),
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container); Containers::arrayView(Data), TestSuite::Compare::Container);
#endif #endif
} }
@ -582,7 +580,7 @@ void CubeMapTextureGLTest::compressedImageBuffer() {
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset), CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset),
Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container); Containers::arrayView(CompressedData), TestSuite::Compare::Container);
#endif #endif
} }
#endif #endif
@ -628,9 +626,8 @@ void CubeMapTextureGLTest::immutableCompressedImage() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedData), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container);
#endif #endif
} }
@ -704,9 +701,8 @@ void CubeMapTextureGLTest::fullImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6)); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(FullDataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(FullDataOffset)), Containers::arrayView(FullData), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{FullData}, TestSuite::Compare::Container);
} }
void CubeMapTextureGLTest::compressedFullImageQuery() { void CubeMapTextureGLTest::compressedFullImageQuery() {
@ -726,9 +722,8 @@ void CubeMapTextureGLTest::compressedFullImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedFullDataOffset),
Containers::ArrayView<const UnsignedByte>(image.data<UnsignedByte>(), image.data().size()).suffix(_compressedFullDataOffset), Containers::arrayView(CompressedFullData), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{CompressedFullData}, TestSuite::Compare::Container);
} }
void CubeMapTextureGLTest::fullImageQueryBuffer() { void CubeMapTextureGLTest::fullImageQueryBuffer() {
@ -749,7 +744,7 @@ void CubeMapTextureGLTest::fullImageQueryBuffer() {
CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6)); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 6));
const auto imageData = image.buffer().data<UnsignedByte>(); const auto imageData = image.buffer().data<UnsignedByte>();
CORRADE_COMPARE_AS(imageData.suffix(FullDataOffset), CORRADE_COMPARE_AS(imageData.suffix(FullDataOffset),
Containers::ArrayView<const UnsignedByte>{FullData}, TestSuite::Compare::Container); Containers::arrayView(FullData), TestSuite::Compare::Container);
} }
void CubeMapTextureGLTest::compressedFullImageQueryBuffer() { void CubeMapTextureGLTest::compressedFullImageQueryBuffer() {
@ -771,7 +766,7 @@ void CubeMapTextureGLTest::compressedFullImageQueryBuffer() {
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 6}));
const auto imageData = image.buffer().data<UnsignedByte>(); const auto imageData = image.buffer().data<UnsignedByte>();
CORRADE_COMPARE_AS(imageData.suffix(_compressedFullDataOffset), CORRADE_COMPARE_AS(imageData.suffix(_compressedFullDataOffset),
Containers::ArrayView<const UnsignedByte>{CompressedFullData}, TestSuite::Compare::Container); Containers::arrayView(CompressedFullData), TestSuite::Compare::Container);
} }
#endif #endif
@ -839,9 +834,8 @@ void CubeMapTextureGLTest::subImage() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(4)); CORRADE_COMPARE(image.size(), Vector2i(4));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(SubDataComplete), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{SubDataComplete}, TestSuite::Compare::Container);
#endif #endif
} }
@ -882,9 +876,9 @@ void CubeMapTextureGLTest::compressedSubImage() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{12}); CORRADE_COMPARE(image.size(), Vector2i{12});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedSubDataComplete),
Containers::ArrayView<const UnsignedByte>{CompressedSubDataComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif
@ -920,9 +914,9 @@ void CubeMapTextureGLTest::compressedSubImage() {
CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && Context::current().isExtensionSupported<Extensions::GL::ARB::direct_state_access>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && Context::current().isExtensionSupported<Extensions::GL::ARB::direct_state_access>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia),
"Non-default compressed pixel storage for cube map textures behaves weirdly on NVidia for client-memory images when using ARB_direct_state_access"); "Non-default compressed pixel storage for cube map textures behaves weirdly on NVidia for client-memory images when using ARB_direct_state_access");
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedSubDataComplete),
Containers::ArrayView<const UnsignedByte>{CompressedSubDataComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif
} }
@ -955,7 +949,8 @@ void CubeMapTextureGLTest::subImageBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(4)); CORRADE_COMPARE(image.size(), Vector2i(4));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{SubDataComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubDataComplete),
TestSuite::Compare::Container);
#endif #endif
} }
@ -997,7 +992,8 @@ void CubeMapTextureGLTest::compressedSubImageBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{12}); CORRADE_COMPARE(image.size(), Vector2i{12});
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedSubDataComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubDataComplete),
TestSuite::Compare::Container);
#endif #endif
} }
#endif #endif
@ -1022,9 +1018,8 @@ void CubeMapTextureGLTest::subImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(2, 2, 1)); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 1));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<const UnsignedByte>(image.data()).suffix(_dataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}).suffix(_dataOffset), Containers::arrayView(Data), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container);
} }
void CubeMapTextureGLTest::compressedSubImageQuery() { void CubeMapTextureGLTest::compressedSubImageQuery() {
@ -1050,9 +1045,9 @@ void CubeMapTextureGLTest::compressedSubImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedData),
Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 0}, {4, 4, 1}), {_compressedDataStorage}); CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 0}, {4, 4, 1}), {_compressedDataStorage});
@ -1060,9 +1055,8 @@ void CubeMapTextureGLTest::compressedSubImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedDataOffset)), Containers::arrayView(CompressedData), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container);
} }
void CubeMapTextureGLTest::subImageQueryBuffer() { void CubeMapTextureGLTest::subImageQueryBuffer() {
@ -1085,7 +1079,8 @@ void CubeMapTextureGLTest::subImageQueryBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(2, 2, 1)); CORRADE_COMPARE(image.size(), Vector3i(2, 2, 1));
CORRADE_COMPARE_AS(imageData.suffix(_dataOffset), Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData.suffix(_dataOffset),
Containers::arrayView(Data), TestSuite::Compare::Container);
} }
void CubeMapTextureGLTest::compressedSubImageQueryBuffer() { void CubeMapTextureGLTest::compressedSubImageQueryBuffer() {
@ -1112,7 +1107,8 @@ void CubeMapTextureGLTest::compressedSubImageQueryBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1}));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedData),
TestSuite::Compare::Container);
} }
CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 0}, {4, 4, 1}), {_compressedDataStorage}, BufferUsage::StaticRead); CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 4, 0}, {4, 4, 1}), {_compressedDataStorage}, BufferUsage::StaticRead);
@ -1121,7 +1117,8 @@ void CubeMapTextureGLTest::compressedSubImageQueryBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 1}));
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset), Containers::ArrayView<const UnsignedByte>{CompressedData}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset),
Containers::arrayView(CompressedData), TestSuite::Compare::Container);
} }
#endif #endif

26
src/Magnum/Test/PixelStorageGLTest.cpp
Unescape View File

@ -136,7 +136,7 @@ void PixelStorageGLTest::unpack2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS(actual.data(), Containers::ArrayView<const char>{ActualData}, CORRADE_COMPARE_AS(actual.data(), Containers::arrayView(ActualData),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -171,7 +171,7 @@ void PixelStorageGLTest::pack2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS(image.data(), Containers::ArrayView<const char>{Data2D}, CORRADE_COMPARE_AS(image.data(), Containers::arrayView(Data2D),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -228,10 +228,10 @@ void PixelStorageGLTest::unpack3D() {
/* Clear padding in the last row (the driver might leave them untouched, /* Clear padding in the last row (the driver might leave them untouched,
confirmed on NVidia 358.16) */ confirmed on NVidia 358.16) */
CORRADE_VERIFY(actual.data().size() == Containers::ArrayView<const char>{ActualData}.size()); CORRADE_VERIFY(actual.data().size() == Containers::arrayView(ActualData).size());
*(actual.data().end() - 1) = *(actual.data().end() - 2) = 0; *(actual.data().end() - 1) = *(actual.data().end() - 2) = 0;
CORRADE_COMPARE_AS(actual.data(), Containers::ArrayView<const char>{ActualData}, CORRADE_COMPARE_AS(actual.data(), Containers::arrayView(ActualData),
TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -259,7 +259,7 @@ void PixelStorageGLTest::pack3D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS(image.data(), Containers::ArrayView<const char>{Data3D}, CORRADE_COMPARE_AS(image.data(), Containers::arrayView(Data3D),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif
@ -311,8 +311,8 @@ void PixelStorageGLTest::unpackCompressed2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS((Containers::ArrayView<const UnsignedByte>{actual.data<UnsignedByte>(), actual.data().size()}), CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(actual.data()),
Containers::ArrayView<const UnsignedByte>{ActualCompressedData}, Containers::arrayView(ActualCompressedData),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -339,8 +339,8 @@ void PixelStorageGLTest::packCompressed2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS((Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, Containers::arrayView(CompressedData2D),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -420,8 +420,8 @@ void PixelStorageGLTest::unpackCompressed3D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS((Containers::ArrayView<const UnsignedByte>{actual.data<UnsignedByte>(), actual.data().size()}), CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(actual.data()),
Containers::ArrayView<const UnsignedByte>{ActualCompressedData}, Containers::arrayView(ActualCompressedData),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -449,8 +449,8 @@ void PixelStorageGLTest::packCompressed3D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE_AS((Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
Containers::ArrayView<const UnsignedByte>{CompressedData3D}, Containers::arrayView(CompressedData3D),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif

22
src/Magnum/Test/RectangleTextureGLTest.cpp
Unescape View File

@ -301,9 +301,8 @@ void RectangleTextureGLTest::image() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE(image.size(), Vector2i(2));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset),
Containers::ArrayView<const UnsignedByte>(image.data<UnsignedByte>(), image.data().size()).suffix(DataOffset), Containers::arrayView(Data), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container);
} }
void RectangleTextureGLTest::compressedImage() { void RectangleTextureGLTest::compressedImage() {
@ -327,7 +326,7 @@ void RectangleTextureGLTest::imageBuffer() {
CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE(image.size(), Vector2i(2));
CORRADE_COMPARE_AS(imageData.suffix(DataOffset), CORRADE_COMPARE_AS(imageData.suffix(DataOffset),
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container); Containers::arrayView(Data), TestSuite::Compare::Container);
} }
void RectangleTextureGLTest::compressedImageBuffer() { void RectangleTextureGLTest::compressedImageBuffer() {
@ -362,9 +361,8 @@ void RectangleTextureGLTest::subImage() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(4)); CORRADE_COMPARE(image.size(), Vector2i(4));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
Containers::ArrayView<const UnsignedByte>(image.data<UnsignedByte>(), image.data().size()), Containers::arrayView(SubDataComplete), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{SubDataComplete}, TestSuite::Compare::Container);
} }
void RectangleTextureGLTest::compressedSubImage() { void RectangleTextureGLTest::compressedSubImage() {
@ -389,7 +387,8 @@ void RectangleTextureGLTest::subImageBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(4)); CORRADE_COMPARE(image.size(), Vector2i(4));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{SubDataComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubDataComplete),
TestSuite::Compare::Container);
} }
void RectangleTextureGLTest::compressedSubImageBuffer() { void RectangleTextureGLTest::compressedSubImageBuffer() {
@ -414,9 +413,8 @@ void RectangleTextureGLTest::subImageQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset),
Containers::ArrayView<const UnsignedByte>(image.data<UnsignedByte>(), image.data().size()).suffix(DataOffset), Containers::arrayView(Data), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container);
} }
void RectangleTextureGLTest::compressedSubImageQuery() { void RectangleTextureGLTest::compressedSubImageQuery() {
@ -443,7 +441,7 @@ void RectangleTextureGLTest::subImageQueryBuffer() {
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS(imageData.suffix(DataOffset), CORRADE_COMPARE_AS(imageData.suffix(DataOffset),
Containers::ArrayView<const UnsignedByte>{Data}, TestSuite::Compare::Container); Containers::arrayView(Data), TestSuite::Compare::Container);
} }
void RectangleTextureGLTest::compressedSubImageQueryBuffer() { void RectangleTextureGLTest::compressedSubImageQueryBuffer() {

83
src/Magnum/Test/TextureArrayGLTest.cpp
Unescape View File

@ -769,9 +769,8 @@ void TextureArrayGLTest::image1D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE(image.size(), Vector2i(2));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset1D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(DataOffset1D)), Containers::arrayView(Data1D), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data1D}, TestSuite::Compare::Container);
} }
void TextureArrayGLTest::compressedImage1D() { void TextureArrayGLTest::compressedImage1D() {
@ -796,7 +795,7 @@ void TextureArrayGLTest::image1DBuffer() {
CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE(image.size(), Vector2i(2));
CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D),
Containers::ArrayView<const UnsignedByte>{Data1D}, TestSuite::Compare::Container); Containers::arrayView(Data1D), TestSuite::Compare::Container);
} }
void TextureArrayGLTest::compressedImage1DBuffer() { void TextureArrayGLTest::compressedImage1DBuffer() {
@ -845,9 +844,8 @@ void TextureArrayGLTest::image2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(2)); CORRADE_COMPARE(image.size(), Vector3i(2));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset2D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(DataOffset2D)), Containers::arrayView(Data2D), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data2D}, TestSuite::Compare::Container);
#endif #endif
} }
@ -879,9 +877,9 @@ void TextureArrayGLTest::compressedImage2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset2D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedDataOffset2D)), Containers::arrayView(CompressedData2D),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -906,7 +904,7 @@ void TextureArrayGLTest::image2DBuffer() {
CORRADE_COMPARE(image.size(), Vector3i(2)); CORRADE_COMPARE(image.size(), Vector3i(2));
CORRADE_COMPARE_AS(imageData.suffix(DataOffset2D), CORRADE_COMPARE_AS(imageData.suffix(DataOffset2D),
Containers::ArrayView<const UnsignedByte>{Data2D}, TestSuite::Compare::Container); Containers::arrayView(Data2D), TestSuite::Compare::Container);
#endif #endif
} }
@ -940,7 +938,8 @@ void TextureArrayGLTest::compressedImage2DBuffer() {
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2}));
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); Containers::arrayView(CompressedData2D),
TestSuite::Compare::Container);
#endif #endif
} }
@ -972,9 +971,8 @@ void TextureArrayGLTest::subImage1D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(4)); CORRADE_COMPARE(image.size(), Vector2i(4));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(SubData1DComplete), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{SubData1DComplete}, TestSuite::Compare::Container);
} }
void TextureArrayGLTest::compressedSubImage1D() { void TextureArrayGLTest::compressedSubImage1D() {
@ -999,7 +997,8 @@ void TextureArrayGLTest::subImage1DBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(4)); CORRADE_COMPARE(image.size(), Vector2i(4));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{SubData1DComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubData1DComplete),
TestSuite::Compare::Container);
} }
void TextureArrayGLTest::compressedSubImage1DBuffer() { void TextureArrayGLTest::compressedSubImage1DBuffer() {
@ -1024,8 +1023,8 @@ void TextureArrayGLTest::subImage1DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset1D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(DataOffset1D)), Containers::ArrayView<const UnsignedByte>{Data1D}, TestSuite::Compare::Container); Containers::arrayView(Data1D), TestSuite::Compare::Container);
} }
void TextureArrayGLTest::compressedSubImage1DQuery() { void TextureArrayGLTest::compressedSubImage1DQuery() {
@ -1052,7 +1051,7 @@ void TextureArrayGLTest::subImage1DQueryBuffer() {
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D),
Containers::ArrayView<const UnsignedByte>{Data1D}, TestSuite::Compare::Container); Containers::arrayView(Data1D), TestSuite::Compare::Container);
} }
void TextureArrayGLTest::compressedSubImage1DQueryBuffer() { void TextureArrayGLTest::compressedSubImage1DQueryBuffer() {
@ -1141,8 +1140,9 @@ void TextureArrayGLTest::subImage2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(4)); CORRADE_COMPARE(image.size(), Vector3i(4));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::ArrayView<const UnsignedByte>{SubData2DComplete}, TestSuite::Compare::Container); Containers::arrayView(SubData2DComplete),
TestSuite::Compare::Container);
#endif #endif
} }
@ -1176,8 +1176,9 @@ void TextureArrayGLTest::compressedSubImage2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{12, 4, 4})); CORRADE_COMPARE(image.size(), (Vector3i{12, 4, 4}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
Containers::ArrayView<const UnsignedByte>(image.data<UnsignedByte>(), image.data().size()), Containers::ArrayView<const UnsignedByte>{CompressedSubData2DComplete}, TestSuite::Compare::Container); Containers::arrayView(CompressedSubData2DComplete),
TestSuite::Compare::Container);
} }
#endif #endif
@ -1203,8 +1204,9 @@ void TextureArrayGLTest::compressedSubImage2D() {
CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia),
"Non-default compressed pixel storage for array textures behaves weirdly on NVidia"); "Non-default compressed pixel storage for array textures behaves weirdly on NVidia");
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
Containers::ArrayView<const UnsignedByte>(image.data<UnsignedByte>(), image.data().size()), Containers::ArrayView<const UnsignedByte>{CompressedSubData2DComplete}, TestSuite::Compare::Container); Containers::arrayView(CompressedSubData2DComplete),
TestSuite::Compare::Container);
} }
#endif #endif
} }
@ -1231,7 +1233,8 @@ void TextureArrayGLTest::subImage2DBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(4)); CORRADE_COMPARE(image.size(), Vector3i(4));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{SubData2DComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubData2DComplete),
TestSuite::Compare::Container);
#endif #endif
} }
@ -1266,7 +1269,8 @@ void TextureArrayGLTest::compressedSubImage2DBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{12, 4, 4})); CORRADE_COMPARE(image.size(), (Vector3i{12, 4, 4}));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedSubData2DComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubData2DComplete),
TestSuite::Compare::Container);
} }
#endif #endif
@ -1293,7 +1297,8 @@ void TextureArrayGLTest::compressedSubImage2DBuffer() {
CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), CORRADE_EXPECT_FAIL_IF(Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia),
"Non-default compressed pixel storage for array textures behaves weirdly on NVidia"); "Non-default compressed pixel storage for array textures behaves weirdly on NVidia");
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedSubData2DComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubData2DComplete),
TestSuite::Compare::Container);
} }
#endif #endif
} }
@ -1317,8 +1322,8 @@ void TextureArrayGLTest::subImage2DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i{2}); CORRADE_COMPARE(image.size(), Vector3i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset2D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(DataOffset2D)), Containers::ArrayView<const UnsignedByte>{Data2D}, TestSuite::Compare::Container); Containers::arrayView(Data2D), TestSuite::Compare::Container);
} }
void TextureArrayGLTest::compressedSubImage2DQuery() { void TextureArrayGLTest::compressedSubImage2DQuery() {
@ -1344,9 +1349,9 @@ void TextureArrayGLTest::compressedSubImage2DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedData2D),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 1}, {4, 4, 2}), {_compressedDataStorage2D}); CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 1}, {4, 4, 2}), {_compressedDataStorage2D});
@ -1354,9 +1359,9 @@ void TextureArrayGLTest::compressedSubImage2DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset2D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedDataOffset2D)), Containers::arrayView(CompressedData2D),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
void TextureArrayGLTest::subImage2DQueryBuffer() { void TextureArrayGLTest::subImage2DQueryBuffer() {
@ -1379,7 +1384,7 @@ void TextureArrayGLTest::subImage2DQueryBuffer() {
CORRADE_COMPARE(image.size(), Vector3i{2}); CORRADE_COMPARE(image.size(), Vector3i{2});
CORRADE_COMPARE_AS(imageData.suffix(DataOffset2D), CORRADE_COMPARE_AS(imageData.suffix(DataOffset2D),
Containers::ArrayView<const UnsignedByte>{Data2D}, TestSuite::Compare::Container); Containers::arrayView(Data2D), TestSuite::Compare::Container);
} }
void TextureArrayGLTest::compressedSubImage2DQueryBuffer() { void TextureArrayGLTest::compressedSubImage2DQueryBuffer() {
@ -1409,7 +1414,9 @@ void TextureArrayGLTest::compressedSubImage2DQueryBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2})); CORRADE_COMPARE(image.size(), (Vector3i{4, 4, 2}));
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D),
Containers::arrayView(CompressedData2D),
TestSuite::Compare::Container);
} }
void TextureArrayGLTest::generateMipmap1D() { void TextureArrayGLTest::generateMipmap1D() {

140
src/Magnum/Test/TextureGLTest.cpp
Unescape View File

@ -1053,9 +1053,8 @@ void TextureGLTest::image1D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), 2); CORRADE_COMPARE(image.size(), 2);
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset1D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(DataOffset1D)), Containers::arrayView(Data1D), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data1D}, TestSuite::Compare::Container);
} }
void TextureGLTest::compressedImage1D() { void TextureGLTest::compressedImage1D() {
@ -1077,7 +1076,7 @@ void TextureGLTest::image1DBuffer() {
CORRADE_COMPARE(image.size(), 2); CORRADE_COMPARE(image.size(), 2);
CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D),
Containers::ArrayView<const UnsignedByte>{Data1D}, TestSuite::Compare::Container); Containers::arrayView(Data1D), TestSuite::Compare::Container);
} }
void TextureGLTest::compressedImage1DBuffer() { void TextureGLTest::compressedImage1DBuffer() {
@ -1112,9 +1111,8 @@ void TextureGLTest::image2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE(image.size(), Vector2i(2));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_dataOffset2D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_dataOffset2D)), Containers::arrayView(Data2D), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data2D}, TestSuite::Compare::Container);
#endif #endif
} }
@ -1143,9 +1141,9 @@ void TextureGLTest::compressedImage2D() {
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset2D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedDataOffset2D)), Containers::arrayView(CompressedData2D),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -1167,7 +1165,7 @@ void TextureGLTest::image2DBuffer() {
CORRADE_COMPARE(image.size(), Vector2i(2)); CORRADE_COMPARE(image.size(), Vector2i(2));
CORRADE_COMPARE_AS(imageData.suffix(_dataOffset2D), CORRADE_COMPARE_AS(imageData.suffix(_dataOffset2D),
Containers::ArrayView<const UnsignedByte>{Data2D}, TestSuite::Compare::Container); Containers::arrayView(Data2D), TestSuite::Compare::Container);
#endif #endif
} }
@ -1197,7 +1195,8 @@ void TextureGLTest::compressedImage2DBuffer() {
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); Containers::arrayView(CompressedData2D),
TestSuite::Compare::Container);
#endif #endif
} }
#endif #endif
@ -1246,9 +1245,8 @@ void TextureGLTest::image3D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(2)); CORRADE_COMPARE(image.size(), Vector3i(2));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_dataOffset3D),
Containers::ArrayView<const UnsignedByte>(image.data<UnsignedByte>(), image.data().size()).suffix(_dataOffset3D), Containers::arrayView(Data3D), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{Data3D}, TestSuite::Compare::Container);
#endif #endif
} }
@ -1271,9 +1269,9 @@ void TextureGLTest::compressedImage3D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i{4}); CORRADE_COMPARE(image.size(), Vector3i{4});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset3D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedDataOffset3D)), Containers::arrayView(CompressedData3D),
Containers::ArrayView<const UnsignedByte>{CompressedData3D}, TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -1295,7 +1293,7 @@ void TextureGLTest::image3DBuffer() {
CORRADE_COMPARE(image.size(), Vector3i(2)); CORRADE_COMPARE(image.size(), Vector3i(2));
CORRADE_COMPARE_AS(imageData.suffix(_dataOffset3D), CORRADE_COMPARE_AS(imageData.suffix(_dataOffset3D),
Containers::ArrayView<const UnsignedByte>{Data3D}, TestSuite::Compare::Container); Containers::arrayView(Data3D), TestSuite::Compare::Container);
#endif #endif
} }
@ -1320,7 +1318,8 @@ void TextureGLTest::compressedImage3DBuffer() {
CORRADE_COMPARE(image.size(), Vector3i{4}); CORRADE_COMPARE(image.size(), Vector3i{4});
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset3D), CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset3D),
Containers::ArrayView<const UnsignedByte>{CompressedData3D}, TestSuite::Compare::Container); Containers::arrayView(CompressedData3D),
TestSuite::Compare::Container);
#endif #endif
} }
#endif #endif
@ -1347,9 +1346,9 @@ void TextureGLTest::subImage1D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), 4); CORRADE_COMPARE(image.size(), 4);
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset1D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(DataOffset1D)), Containers::arrayView(SubData1DComplete),
Containers::ArrayView<const UnsignedByte>{SubData1DComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
void TextureGLTest::compressedSubImage1D() { void TextureGLTest::compressedSubImage1D() {
@ -1372,7 +1371,8 @@ void TextureGLTest::subImage1DBuffer() {
CORRADE_COMPARE(image.size(), 4); CORRADE_COMPARE(image.size(), 4);
CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D),
Containers::ArrayView<const UnsignedByte>{SubData1DComplete}, TestSuite::Compare::Container); Containers::arrayView(SubData1DComplete),
TestSuite::Compare::Container);
} }
void TextureGLTest::compressedSubImage1DBuffer() { void TextureGLTest::compressedSubImage1DBuffer() {
@ -1395,8 +1395,8 @@ void TextureGLTest::subImage1DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), 2); CORRADE_COMPARE(image.size(), 2);
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(DataOffset1D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(DataOffset1D)), Containers::ArrayView<const UnsignedByte>{Data1D}, TestSuite::Compare::Container); Containers::arrayView(Data1D), TestSuite::Compare::Container);
} }
void TextureGLTest::compressedSubImage1DQuery() { void TextureGLTest::compressedSubImage1DQuery() {
@ -1421,7 +1421,7 @@ void TextureGLTest::subImage1DQueryBuffer() {
CORRADE_COMPARE(image.size(), 2); CORRADE_COMPARE(image.size(), 2);
CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D), CORRADE_COMPARE_AS(imageData.suffix(DataOffset1D),
Containers::ArrayView<const UnsignedByte>{Data1D}, TestSuite::Compare::Container); Containers::arrayView(Data1D), TestSuite::Compare::Container);
} }
void TextureGLTest::compressedSubImage1DQueryBuffer() { void TextureGLTest::compressedSubImage1DQueryBuffer() {
@ -1469,9 +1469,9 @@ void TextureGLTest::subImage2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(4)); CORRADE_COMPARE(image.size(), Vector2i(4));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(SubData2DComplete),
Containers::ArrayView<const UnsignedByte>{SubData2DComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -1501,9 +1501,9 @@ void TextureGLTest::compressedSubImage2D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector2i{12, 4})); CORRADE_COMPARE(image.size(), (Vector2i{12, 4}));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedSubData2DComplete),
Containers::ArrayView<const UnsignedByte>{CompressedSubData2DComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -1525,7 +1525,8 @@ void TextureGLTest::subImage2DBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i(4)); CORRADE_COMPARE(image.size(), Vector2i(4));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{SubData2DComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubData2DComplete),
TestSuite::Compare::Container);
#endif #endif
} }
@ -1556,7 +1557,8 @@ void TextureGLTest::compressedSubImage2DBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), (Vector2i{12, 4})); CORRADE_COMPARE(image.size(), (Vector2i{12, 4}));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedSubData2DComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedSubData2DComplete),
TestSuite::Compare::Container);
#endif #endif
} }
#endif #endif
@ -1578,8 +1580,8 @@ void TextureGLTest::subImage2DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_dataOffset2D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_dataOffset2D)), Containers::ArrayView<const UnsignedByte>{Data2D}, TestSuite::Compare::Container); Containers::arrayView(Data2D), TestSuite::Compare::Container);
} }
void TextureGLTest::compressedSubImage2DQuery() { void TextureGLTest::compressedSubImage2DQuery() {
@ -1602,9 +1604,9 @@ void TextureGLTest::compressedSubImage2DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedData2D),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
CompressedImage2D image = texture.compressedSubImage(0, Range2Di::fromSize({4, 0}, Vector2i{4}), {_compressedDataStorage2D}); CompressedImage2D image = texture.compressedSubImage(0, Range2Di::fromSize({4, 0}, Vector2i{4}), {_compressedDataStorage2D});
@ -1612,9 +1614,9 @@ void TextureGLTest::compressedSubImage2DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset2D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedDataOffset2D)), Containers::arrayView(CompressedData2D),
Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
void TextureGLTest::subImage2DQueryBuffer() { void TextureGLTest::subImage2DQueryBuffer() {
@ -1635,7 +1637,7 @@ void TextureGLTest::subImage2DQueryBuffer() {
CORRADE_COMPARE(image.size(), Vector2i{2}); CORRADE_COMPARE(image.size(), Vector2i{2});
CORRADE_COMPARE_AS(imageData.suffix(_dataOffset2D), CORRADE_COMPARE_AS(imageData.suffix(_dataOffset2D),
Containers::ArrayView<const UnsignedByte>{Data2D}, TestSuite::Compare::Container); Containers::arrayView(Data2D), TestSuite::Compare::Container);
} }
void TextureGLTest::compressedSubImage2DQueryBuffer() { void TextureGLTest::compressedSubImage2DQueryBuffer() {
@ -1659,7 +1661,8 @@ void TextureGLTest::compressedSubImage2DQueryBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedData2D),
TestSuite::Compare::Container);
} }
CompressedBufferImage2D image = texture.compressedSubImage(0, Range2Di::fromSize({4, 0}, Vector2i{4}), {_compressedDataStorage2D}, BufferUsage::StaticRead); CompressedBufferImage2D image = texture.compressedSubImage(0, Range2Di::fromSize({4, 0}, Vector2i{4}), {_compressedDataStorage2D}, BufferUsage::StaticRead);
@ -1668,7 +1671,9 @@ void TextureGLTest::compressedSubImage2DQueryBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector2i{4}); CORRADE_COMPARE(image.size(), Vector2i{4});
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D), Containers::ArrayView<const UnsignedByte>{CompressedData2D}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset2D),
Containers::arrayView(CompressedData2D),
TestSuite::Compare::Container);
} }
#endif #endif
@ -1763,9 +1768,9 @@ void TextureGLTest::subImage3D() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(4)); CORRADE_COMPARE(image.size(), Vector3i(4));
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(SubData3DComplete),
Containers::ArrayView<const UnsignedByte>{SubData3DComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
#endif #endif
} }
@ -1795,9 +1800,9 @@ void TextureGLTest::compressedSubImage3D() {
CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia),
"Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia");
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedSubData3DComplete),
Containers::ArrayView<const UnsignedByte>{CompressedSubData3DComplete}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
#endif #endif
} }
@ -1820,7 +1825,8 @@ void TextureGLTest::subImage3DBuffer() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i(4)); CORRADE_COMPARE(image.size(), Vector3i(4));
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{SubData3DComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(SubData3DComplete),
TestSuite::Compare::Container);
#endif #endif
} }
@ -1851,7 +1857,9 @@ void TextureGLTest::compressedSubImage3DBuffer() {
CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia),
"Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia");
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedSubData3DComplete}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData,
Containers::arrayView(CompressedSubData3DComplete),
TestSuite::Compare::Container);
} }
#endif #endif
} }
@ -1874,8 +1882,8 @@ void TextureGLTest::subImage3DQuery() {
MAGNUM_VERIFY_NO_ERROR(); MAGNUM_VERIFY_NO_ERROR();
CORRADE_COMPARE(image.size(), Vector3i{2}); CORRADE_COMPARE(image.size(), Vector3i{2});
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_dataOffset3D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_dataOffset3D)), Containers::ArrayView<const UnsignedByte>{Data3D}, TestSuite::Compare::Container); Containers::arrayView(Data3D), TestSuite::Compare::Container);
} }
void TextureGLTest::compressedSubImage3DQuery() { void TextureGLTest::compressedSubImage3DQuery() {
@ -1902,9 +1910,9 @@ void TextureGLTest::compressedSubImage3DQuery() {
CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::NVidia, CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::NVidia,
"Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia");
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}), Containers::arrayView(CompressedData3D),
Containers::ArrayView<const UnsignedByte>{CompressedData3D}, TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 0}, Vector3i{4}), {_compressedDataStorage3D}); CompressedImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 0}, Vector3i{4}), {_compressedDataStorage3D});
@ -1917,9 +1925,8 @@ void TextureGLTest::compressedSubImage3DQuery() {
CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia),
"Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia");
CORRADE_COMPARE_AS( CORRADE_COMPARE_AS(Containers::arrayCast<UnsignedByte>(image.data()).suffix(_compressedDataOffset3D),
(Containers::ArrayView<const UnsignedByte>{image.data<UnsignedByte>(), image.data().size()}.suffix(_compressedDataOffset3D)), Containers::arrayView(CompressedData3D), TestSuite::Compare::Container);
Containers::ArrayView<const UnsignedByte>{CompressedData3D}, TestSuite::Compare::Container);
} }
} }
@ -1941,7 +1948,7 @@ void TextureGLTest::subImage3DQueryBuffer() {
CORRADE_COMPARE(image.size(), Vector3i{2}); CORRADE_COMPARE(image.size(), Vector3i{2});
CORRADE_COMPARE_AS(imageData.suffix(_dataOffset3D), CORRADE_COMPARE_AS(imageData.suffix(_dataOffset3D),
Containers::ArrayView<const UnsignedByte>{Data3D}, TestSuite::Compare::Container); Containers::arrayView(Data3D), TestSuite::Compare::Container);
} }
void TextureGLTest::compressedSubImage3DQueryBuffer() { void TextureGLTest::compressedSubImage3DQueryBuffer() {
@ -1969,7 +1976,8 @@ void TextureGLTest::compressedSubImage3DQueryBuffer() {
CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::NVidia, CORRADE_EXPECT_FAIL_IF(Context::current().detectedDriver() & Context::DetectedDriver::NVidia,
"Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia");
CORRADE_COMPARE_AS(imageData, Containers::ArrayView<const UnsignedByte>{CompressedData3D}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData, Containers::arrayView(CompressedData3D),
TestSuite::Compare::Container);
} }
CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 0}, Vector3i{4}), {_compressedDataStorage3D}, BufferUsage::StaticRead); CompressedBufferImage3D image = texture.compressedSubImage(0, Range3Di::fromSize({4, 0, 0}, Vector3i{4}), {_compressedDataStorage3D}, BufferUsage::StaticRead);
@ -1983,7 +1991,9 @@ void TextureGLTest::compressedSubImage3DQueryBuffer() {
CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia), CORRADE_EXPECT_FAIL_IF(!Context::current().isExtensionSupported<Extensions::GL::ARB::compressed_texture_pixel_storage>() && (Context::current().detectedDriver() & Context::DetectedDriver::NVidia),
"Default compressed pixel storage behaves weirdly with BPTC compression on NVidia"); "Default compressed pixel storage behaves weirdly with BPTC compression on NVidia");
CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset3D), Containers::ArrayView<const UnsignedByte>{CompressedData3D}, TestSuite::Compare::Container); CORRADE_COMPARE_AS(imageData.suffix(_compressedDataOffset3D),
Containers::arrayView(CompressedData3D),
TestSuite::Compare::Container);
} }
} }

4
src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
Unescape View File

@ -133,7 +133,7 @@ void TgaImageConverterTest::rgb() {
CORRADE_COMPARE(converted->size(), Vector2i(2, 3)); CORRADE_COMPARE(converted->size(), Vector2i(2, 3));
CORRADE_COMPARE(converted->format(), PixelFormat::RGB); CORRADE_COMPARE(converted->format(), PixelFormat::RGB);
CORRADE_COMPARE(converted->type(), PixelType::UnsignedByte); CORRADE_COMPARE(converted->type(), PixelType::UnsignedByte);
CORRADE_COMPARE_AS(converted->data(), Containers::ArrayView<const char>{ConvertedDataRGB}, CORRADE_COMPARE_AS(converted->data(), Containers::arrayView(ConvertedDataRGB),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -149,7 +149,7 @@ void TgaImageConverterTest::rgba() {
CORRADE_COMPARE(converted->size(), Vector2i(2, 3)); CORRADE_COMPARE(converted->size(), Vector2i(2, 3));
CORRADE_COMPARE(converted->format(), PixelFormat::RGBA); CORRADE_COMPARE(converted->format(), PixelFormat::RGBA);
CORRADE_COMPARE(converted->type(), PixelType::UnsignedByte); CORRADE_COMPARE(converted->type(), PixelType::UnsignedByte);
CORRADE_COMPARE_AS(converted->data(), Containers::ArrayView<const char>{OriginalDataRGBA}, CORRADE_COMPARE_AS(converted->data(), Containers::arrayView(OriginalDataRGBA),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }

6
src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp
Unescape View File

@ -135,7 +135,7 @@ void TgaImporterTest::colorBits24() {
CORRADE_COMPARE(image->format(), PixelFormat::RGB); CORRADE_COMPARE(image->format(), PixelFormat::RGB);
CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->size(), Vector2i(2, 3));
CORRADE_COMPARE(image->type(), PixelType::UnsignedByte); CORRADE_COMPARE(image->type(), PixelType::UnsignedByte);
CORRADE_COMPARE_AS(image->data(), Containers::ArrayView<const char>{pixels}, CORRADE_COMPARE_AS(image->data(), Containers::arrayView(pixels),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -160,7 +160,7 @@ void TgaImporterTest::colorBits32() {
CORRADE_COMPARE(image->format(), PixelFormat::RGBA); CORRADE_COMPARE(image->format(), PixelFormat::RGBA);
CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->size(), Vector2i(2, 3));
CORRADE_COMPARE(image->type(), PixelType::UnsignedByte); CORRADE_COMPARE(image->type(), PixelType::UnsignedByte);
CORRADE_COMPARE_AS(image->data(), Containers::ArrayView<const char>{pixels}, CORRADE_COMPARE_AS(image->data(), Containers::arrayView(pixels),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }
@ -184,7 +184,7 @@ void TgaImporterTest::grayscaleBits8() {
#endif #endif
CORRADE_COMPARE(image->size(), Vector2i(2, 3)); CORRADE_COMPARE(image->size(), Vector2i(2, 3));
CORRADE_COMPARE(image->type(), PixelType::UnsignedByte); CORRADE_COMPARE(image->type(), PixelType::UnsignedByte);
CORRADE_COMPARE_AS(image->data(), Containers::ArrayView<const char>{data}.suffix(18), CORRADE_COMPARE_AS(image->data(), Containers::arrayView(data).suffix(18),
TestSuite::Compare::Container); TestSuite::Compare::Container);
} }

Write Preview
Loading…
Cancel
Save