From 514d8a83ebe1715a473dca901f19ef7038678fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 3 Sep 2023 20:00:14 +0200 Subject: [PATCH] GL: don't attempt to test gl_BaseInstance on WebGL. It's no longer present in the extension :( --- src/Magnum/GL/Test/MeshGLTest.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index 7a8c2c429..1617b401b 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -4752,6 +4752,8 @@ void MeshGLTest::multiDrawInstanced() { #else if(!GL::Context::current().isExtensionSupported()) CORRADE_SKIP(GL::Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not supported."); + /* https://github.com/KhronosGroup/WebGL/pull/3278 :( */ + CORRADE_SKIP(GL::Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is supported, but recent revisions of the extension don't support gl_BaseVertex / gl_BaseInstance anymore."); #endif #else CORRADE_FAIL("Can't do base instance here."); @@ -4833,6 +4835,8 @@ void MeshGLTest::multiDrawInstancedSparseArrays() { #else if(!GL::Context::current().isExtensionSupported()) CORRADE_SKIP(GL::Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not supported."); + /* https://github.com/KhronosGroup/WebGL/pull/3278 :( */ + CORRADE_SKIP(GL::Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is supported, but recent revisions of the extension don't support gl_BaseVertex / gl_BaseInstance anymore."); #endif #else CORRADE_FAIL("Can't do base instance here."); @@ -4933,6 +4937,8 @@ template void MeshGLTest::multiDrawInstancedIndexed() { #else if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not supported."); + /* https://github.com/KhronosGroup/WebGL/pull/3278 :( */ + CORRADE_SKIP(GL::Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is supported, but recent revisions of the extension don't support gl_BaseVertex / gl_BaseInstance anymore."); #endif #else CORRADE_FAIL("Can't do base vertex or base instance here."); @@ -5024,6 +5030,8 @@ template void MeshGLTest::multiDrawInstancedIndexedSparseArrays() { #else if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is not supported."); + /* https://github.com/KhronosGroup/WebGL/pull/3278 :( */ + CORRADE_SKIP(GL::Extensions::WEBGL::multi_draw_instanced_base_vertex_base_instance::string() << "is supported, but recent revisions of the extension don't support gl_BaseVertex / gl_BaseInstance anymore."); #endif #else CORRADE_FAIL("Can't do base vertex or base instance here.");