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

Test: fix compiler warning when compiling on ES3.

pull/205/head
Vladimír Vondruš 8 years ago
parent
d5ba6cd53d
commit
bcec6b92f1
5 changed files with 22 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Magnum/Test/CubeMapTextureArrayGLTest.cpp
  2. 4
      src/Magnum/Test/CubeMapTextureGLTest.cpp
  3. 4
      src/Magnum/Test/TextureArrayGLTest.cpp
  4. 8
      src/Magnum/Test/TextureGLTest.cpp
  5. 2
      src/Magnum/Test/TransformFeedbackGLTest.cpp

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

@ -712,6 +712,7 @@ void CubeMapTextureArrayGLTest::compressedImageBuffer() {
namespace {
constexpr UnsignedByte Zero[4*4*4*6]{};
#ifndef MAGNUM_TARGET_GLES
constexpr UnsignedByte SubDataComplete[]{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -743,6 +744,7 @@ namespace {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void CubeMapTextureArrayGLTest::subImage() {
@ -873,6 +875,7 @@ namespace {
/* Just 12x12x6 zeros compressed using RGBA DXT3 by the driver */
constexpr UnsignedByte CompressedZero[9*16*6]{};
#ifndef MAGNUM_TARGET_GLES
/* Combination of CompressedZero and CompressedSubData */
constexpr UnsignedByte CompressedSubDataComplete[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -933,6 +936,7 @@ namespace {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void CubeMapTextureArrayGLTest::compressedSubImage() {

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

@ -657,12 +657,14 @@ void CubeMapTextureGLTest::imageBuffer() {
namespace {
constexpr UnsignedByte Zero[4*4*4]{};
#ifndef MAGNUM_TARGET_GLES
constexpr UnsignedByte SubDataComplete[]{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0, 0, 0, 0,
0, 0, 0, 0, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void CubeMapTextureGLTest::subImage() {
@ -956,6 +958,7 @@ namespace {
/* Just 12x12 zeros compressed using RGBA DXT3 by the driver */
constexpr UnsignedByte CompressedZero[9*16]{};
#ifndef MAGNUM_TARGET_GLES
/* Combination of CompressedZero and CompressedData */
constexpr UnsignedByte CompressedSubDataComplete[]{
0, 0, 0, 0, 0, 0, 0, 0,
@ -979,6 +982,7 @@ namespace {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void CubeMapTextureGLTest::compressedSubImage() {

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

@ -1066,6 +1066,7 @@ void TextureArrayGLTest::image2DBuffer() {
namespace {
constexpr UnsignedByte Zero2D[4*4*4*4]{};
#ifndef MAGNUM_TARGET_GLES
constexpr UnsignedByte SubData2DComplete[]{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -1087,6 +1088,7 @@ namespace {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void TextureArrayGLTest::subImage2D() {
@ -1298,6 +1300,7 @@ namespace {
/* Just 12x4x4 zeros compressed using RGBA DXT3 by the driver */
constexpr UnsignedByte CompressedZero2D[3*4*16]{};
#ifndef MAGNUM_TARGET_GLES
/* Combination of CompressedZero2D and CompressedData2D */
constexpr UnsignedByte CompressedSubData2DComplete[]{
0, 0, 0, 0, 0, 0, 0, 0,
@ -1328,6 +1331,7 @@ namespace {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void TextureArrayGLTest::compressedSubImage2D() {

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

@ -1451,12 +1451,14 @@ void TextureGLTest::image2DBuffer() {
namespace {
constexpr UnsignedByte Zero2D[4*4*4]{};
#ifndef MAGNUM_TARGET_GLES
constexpr UnsignedByte SubData2DComplete[]{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0, 0, 0, 0,
0, 0, 0, 0, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void TextureGLTest::subImage2D() {
@ -1653,6 +1655,7 @@ namespace {
/* Just 12x4 zeros compressed using RGBA DXT3 by the driver */
constexpr UnsignedByte CompressedZero2D[3*16]{};
#ifndef MAGNUM_TARGET_GLES
/* Combination of CompressedZero2D and CompressedData2D */
constexpr UnsignedByte CompressedSubData2DComplete[]{
0, 0, 0, 0, 0, 0, 0, 0,
@ -1662,6 +1665,7 @@ namespace {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void TextureGLTest::compressedSubImage2D() {
@ -1874,6 +1878,7 @@ void TextureGLTest::image3DBuffer() {
namespace {
constexpr UnsignedByte Zero3D[4*4*4*4]{};
#ifndef MAGNUM_TARGET_GLES
constexpr UnsignedByte SubData3DComplete[]{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -1895,6 +1900,7 @@ namespace {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void TextureGLTest::subImage3D() {
@ -2077,6 +2083,7 @@ void TextureGLTest::compressedImage3DBuffer() {
#endif
namespace {
#ifndef MAGNUM_TARGET_GLES
/* Just 12x4x4 zeros compressed using RGBA BPTC Unorm by the driver */
constexpr UnsignedByte CompressedZero3D[3*4*16]{
64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -2118,6 +2125,7 @@ namespace {
64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#endif
}
void TextureGLTest::compressedSubImage3D() {

2
src/Magnum/Test/TransformFeedbackGLTest.cpp
Unescape View File

@ -66,6 +66,7 @@ struct TransformFeedbackGLTest: OpenGLTester {
namespace {
#ifndef MAGNUM_TARGET_GLES
enum: std::size_t { DrawDataCount = 4 };
const struct {
@ -81,6 +82,7 @@ const struct {
{"stream", 1, 1, 0, 6, 6},
{"streamInstanced", 1, 5, 0, 6, 30}
};
#endif
}

Write Preview
Loading…
Cancel
Save