@ -378,8 +378,6 @@ const struct {
{ " skip Y " ,
{ " skip Y " ,
Containers : : arrayView ( CompressedData2D ) . exceptPrefix ( 16 ) ,
Containers : : arrayView ( CompressedData2D ) . exceptPrefix ( 16 ) ,
CompressedPixelStorage { }
CompressedPixelStorage { }
. setCompressedBlockSize ( { 4 , 4 , 1 } )
. setCompressedBlockDataSize ( 16 )
. setSkip ( { 0 , 4 , 0 } ) ,
. setSkip ( { 0 , 4 , 0 } ) ,
Containers : : arrayView ( CompressedData2D ) , 16 }
Containers : : arrayView ( CompressedData2D ) , 16 }
# endif
# endif
@ -449,8 +447,6 @@ const struct {
{ " skip Z " ,
{ " skip Z " ,
Containers : : arrayView ( CompressedData3D ) . exceptPrefix ( 16 * 4 ) ,
Containers : : arrayView ( CompressedData3D ) . exceptPrefix ( 16 * 4 ) ,
CompressedPixelStorage { }
CompressedPixelStorage { }
. setCompressedBlockSize ( { 4 , 4 , 1 } )
. setCompressedBlockDataSize ( 16 )
. setSkip ( { 0 , 0 , 4 } ) ,
. setSkip ( { 0 , 0 , 4 } ) ,
Containers : : arrayView ( CompressedData3D ) , 16 * 4 }
Containers : : arrayView ( CompressedData3D ) , 16 * 4 }
# endif
# endif
@ -2181,8 +2177,7 @@ void TextureGLTest::compressedImage2D() {
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
# ifndef MAGNUM_TARGET_GLES
# ifndef MAGNUM_TARGET_GLES
CompressedImage2D image { data . storage , CompressedPixelFormat : : RGBAS3tcDxt3 , { } , nullptr } ;
CompressedImage2D image = texture . compressedImage ( 0 , { data . storage } ) ;
texture . compressedImage ( 0 , image ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
@ -2226,8 +2221,7 @@ void TextureGLTest::compressedImage2DBuffer() {
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
# ifndef MAGNUM_TARGET_GLES
# ifndef MAGNUM_TARGET_GLES
CompressedBufferImage2D image { data . storage , CompressedPixelFormat : : RGBAS3tcDxt3 , { } , nullptr , BufferUsage : : StaticRead } ;
CompressedBufferImage2D image = texture . compressedImage ( 0 , { data . storage } , BufferUsage : : StaticRead ) ;
texture . compressedImage ( 0 , image , BufferUsage : : StaticRead ) ;
const auto imageData = image . buffer ( ) . data ( ) ;
const auto imageData = image . buffer ( ) . data ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
@ -2396,8 +2390,8 @@ void TextureGLTest::compressedSubImage2DQuery() {
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
CompressedImage2D image { data . storage , CompressedPixelFormat : : RGBAS3tcDxt3 , { } , nullptr } ;
CompressedImage2D image = texture . compressedSubImage ( 0 , Range2Di : : fromSize ( { 4 , 0 } , Vector2i { 4 } ) ,
texture . compressedSubImage ( 0 , Range2Di : : fromSize ( { 4 , 0 } , Vector2i { 4 } ) , image ) ;
{ data . storage } ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
@ -2456,8 +2450,8 @@ void TextureGLTest::compressedSubImage2DQueryBuffer() {
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
CompressedBufferImage2D image { data . storage , CompressedPixelFormat : : RGBAS3tcDxt3 , { } , nullptr , BufferUsage : : StaticRead } ;
CompressedBufferImage2D image = texture . compressedSubImage ( 0 , Range2Di : : fromSize ( { 4 , 0 } , Vector2i { 4 } ) ,
texture . compressedSubImage ( 0 , Range2Di : : fromSize ( { 4 , 0 } , Vector2i { 4 } ) , image , BufferUsage : : StaticRead ) ;
{ data . storage } , BufferUsage : : StaticRead ) ;
const auto imageData = image . buffer ( ) . data ( ) ;
const auto imageData = image . buffer ( ) . data ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
@ -2766,8 +2760,7 @@ void TextureGLTest::compressedImage3D() {
/** @todo How to test this on ES? */
/** @todo How to test this on ES? */
# ifndef MAGNUM_TARGET_GLES
# ifndef MAGNUM_TARGET_GLES
CompressedImage3D image { data . storage , CompressedPixelFormat : : RGBABptcUnorm , { } , nullptr } ;
CompressedImage3D image = texture . compressedImage ( 0 , { data . storage } ) ;
texture . compressedImage ( 0 , image ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
@ -2808,8 +2801,7 @@ void TextureGLTest::compressedImage3DBuffer() {
/** @todo How to test this on ES? */
/** @todo How to test this on ES? */
# ifndef MAGNUM_TARGET_GLES
# ifndef MAGNUM_TARGET_GLES
CompressedBufferImage3D image { data . storage , CompressedPixelFormat : : RGBABptcUnorm , { } , nullptr , BufferUsage : : StaticRead } ;
CompressedBufferImage3D image = texture . compressedImage ( 0 , { data . storage } , BufferUsage : : StaticRead ) ;
texture . compressedImage ( 0 , image , BufferUsage : : StaticRead ) ;
const auto imageData = image . buffer ( ) . data ( ) ;
const auto imageData = image . buffer ( ) . data ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
@ -3011,8 +3003,8 @@ void TextureGLTest::compressedSubImage3DQuery() {
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
CompressedImage3D image { data . storage , CompressedPixelFormat : : RGBABptcUnorm , { } , nullptr } ;
CompressedImage3D image = texture . compressedSubImage ( 0 , Range3Di : : fromSize ( { 4 , 0 , 0 } , Vector3i { 4 } ) ,
texture . compressedSubImage ( 0 , Range3Di : : fromSize ( { 4 , 0 , 0 } , Vector3i { 4 } ) , image ) ;
{ data . storage } ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
@ -3077,8 +3069,8 @@ void TextureGLTest::compressedSubImage3DQueryBuffer() {
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
CompressedBufferImage3D image { data . storage , CompressedPixelFormat : : RGBABptcUnorm , { } , nullptr , BufferUsage : : StaticRead } ;
CompressedBufferImage3D image = texture . compressedSubImage ( 0 , Range3Di : : fromSize ( { 4 , 0 , 0 } , Vector3i { 4 } ) ,
texture . compressedSubImage ( 0 , Range3Di : : fromSize ( { 4 , 0 , 0 } , Vector3i { 4 } ) , image , BufferUsage : : StaticRead ) ;
{ data . storage } , BufferUsage : : StaticRead ) ;
const auto imageData = image . buffer ( ) . data ( ) ;
const auto imageData = image . buffer ( ) . data ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;
MAGNUM_VERIFY_NO_GL_ERROR ( ) ;