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

GL: don't try to test texture views w/o texture storage. 

I wonder how this even passed the test before, given my PKGBUILD also
has a variant that disables ARB_texture_storage?
pull/617/head
Vladimír Vondruš 3 years ago
parent
b73f8eca0b
commit
5d330c28b4
6 changed files with 42 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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Magnum/GL/Test/CubeMapTextureArrayGLTest.cpp
  2. 4
      src/Magnum/GL/Test/CubeMapTextureGLTest.cpp
  3. 8
      src/Magnum/GL/Test/MultisampleTextureGLTest.cpp
  4. 2
      src/Magnum/GL/Test/RectangleTextureGLTest.cpp
  5. 12
      src/Magnum/GL/Test/TextureArrayGLTest.cpp
  6. 12
      src/Magnum/GL/Test/TextureGLTest.cpp

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

@ -626,6 +626,8 @@ void CubeMapTextureArrayGLTest::view() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -650,6 +652,8 @@ void CubeMapTextureArrayGLTest::viewOnNonArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else

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

@ -754,6 +754,8 @@ void CubeMapTextureGLTest::storageImageSize() {
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
void CubeMapTextureGLTest::view() { void CubeMapTextureGLTest::view() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -776,6 +778,8 @@ void CubeMapTextureGLTest::viewOnArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else

8
src/Magnum/GL/Test/MultisampleTextureGLTest.cpp
Unescape View File

@ -411,6 +411,8 @@ void MultisampleTextureGLTest::storage2DArray() {
void MultisampleTextureGLTest::view2D() { void MultisampleTextureGLTest::view2D() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage_multisample>())
CORRADE_SKIP(Extensions::ARB::texture_storage_multisample::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>())
CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
@ -433,6 +435,8 @@ void MultisampleTextureGLTest::view2D() {
void MultisampleTextureGLTest::view2DOnArray() { void MultisampleTextureGLTest::view2DOnArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage_multisample>())
CORRADE_SKIP(Extensions::ARB::texture_storage_multisample::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>())
CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
@ -457,6 +461,8 @@ void MultisampleTextureGLTest::view2DOnArray() {
void MultisampleTextureGLTest::view2DArray() { void MultisampleTextureGLTest::view2DArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage_multisample>())
CORRADE_SKIP(Extensions::ARB::texture_storage_multisample::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>())
CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
@ -481,6 +487,8 @@ void MultisampleTextureGLTest::view2DArray() {
void MultisampleTextureGLTest::view2DArrayOnNonArray() { void MultisampleTextureGLTest::view2DArrayOnNonArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage_multisample>())
CORRADE_SKIP(Extensions::ARB::texture_storage_multisample::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_multisample>())
CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_multisample::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())

2
src/Magnum/GL/Test/RectangleTextureGLTest.cpp
Unescape View File

@ -359,6 +359,8 @@ void RectangleTextureGLTest::storage() {
} }
void RectangleTextureGLTest::view() { void RectangleTextureGLTest::view() {
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");

12
src/Magnum/GL/Test/TextureArrayGLTest.cpp
Unescape View File

@ -964,6 +964,8 @@ void TextureArrayGLTest::storage2D() {
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
void TextureArrayGLTest::view1D() { void TextureArrayGLTest::view1D() {
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
@ -978,6 +980,8 @@ void TextureArrayGLTest::view1D() {
} }
void TextureArrayGLTest::view1DOnNonArray() { void TextureArrayGLTest::view1DOnNonArray() {
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
@ -994,6 +998,8 @@ void TextureArrayGLTest::view1DOnNonArray() {
void TextureArrayGLTest::view2D() { void TextureArrayGLTest::view2D() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -1014,6 +1020,8 @@ void TextureArrayGLTest::view2D() {
void TextureArrayGLTest::view2DOnNonArray() { void TextureArrayGLTest::view2DOnNonArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -1034,6 +1042,8 @@ void TextureArrayGLTest::view2DOnNonArray() {
void TextureArrayGLTest::view2DOnCubeMap() { void TextureArrayGLTest::view2DOnCubeMap() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -1056,6 +1066,8 @@ void TextureArrayGLTest::view2DOnCubeMapArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else

12
src/Magnum/GL/Test/TextureGLTest.cpp
Unescape View File

@ -1443,6 +1443,8 @@ void TextureGLTest::storage3D() {
#if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
void TextureGLTest::view1D() { void TextureGLTest::view1D() {
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
@ -1459,6 +1461,8 @@ void TextureGLTest::view1D() {
void TextureGLTest::view2D() { void TextureGLTest::view2D() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -1479,6 +1483,8 @@ void TextureGLTest::view2D() {
void TextureGLTest::view2DOnArray() { void TextureGLTest::view2DOnArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -1499,6 +1505,8 @@ void TextureGLTest::view2DOnArray() {
void TextureGLTest::view2DOnCubeMap() { void TextureGLTest::view2DOnCubeMap() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -1521,6 +1529,8 @@ void TextureGLTest::view2DOnCubeMapArray() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_cube_map_array>())
CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_cube_map_array::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else
@ -1543,6 +1553,8 @@ void TextureGLTest::view2DOnCubeMapArray() {
void TextureGLTest::view3D() { void TextureGLTest::view3D() {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_storage>())
CORRADE_SKIP(Extensions::ARB::texture_storage::string() << "is not supported.");
if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>()) if(!Context::current().isExtensionSupported<Extensions::ARB::texture_view>())
CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported."); CORRADE_SKIP(Extensions::ARB::texture_view::string() << "is not supported.");
#else #else

Write Preview
Loading…
Cancel
Save