GL: wait, why these multidraw entrypoints are defined in MeshView?

This class should only have APIs that take MeshView, everything else
should be in Mesh directly.

src/Magnum/GL/Implementation/MeshState.cpp

@@ -288,7 +288,7 @@ MeshState::MeshState(Context& context, ContextState& contextState, Containers::S
                instance counts because there's no non-instanced variant. Only
                available since 2.0.5: https://github.com/emscripten-core/emscripten/pull/12282 */
             #if __EMSCRIPTEN_major__*10000 + __EMSCRIPTEN_minor__*100 + __EMSCRIPTEN_tiny__ >= 20005
-            multiDrawElementsBaseVertexImplementation = MeshView::multiDrawElementsBaseVertexImplementationANGLE;
+            multiDrawElementsBaseVertexImplementation = Mesh::multiDrawElementsBaseVertexImplementationANGLE;
             #else
             /* In Context::setupDriverWorkarounds() we make sure the extension
                is not even advertised, so this shouldn't be reached. */
@@ -297,7 +297,7 @@ MeshState::MeshState(Context& context, ContextState& contextState, Containers::S
         } else
         #endif
         {
-            multiDrawElementsBaseVertexImplementation = MeshView::multiDrawElementsBaseVertexImplementationAssert;
+            multiDrawElementsBaseVertexImplementation = Mesh::multiDrawElementsBaseVertexImplementationAssert;
         }
         #endif
 

src/Magnum/GL/Mesh.cpp

@@ -1158,4 +1158,25 @@ void Mesh::drawElementsInstancedBaseVertexImplementationAssert(GLenum, GLsizei,
 #endif
 #endif
 
+#ifdef MAGNUM_TARGET_GLES
+#if defined(MAGNUM_TARGET_WEBGL) && !defined(MAGNUM_TARGET_GLES2) && __EMSCRIPTEN_major__*10000 + __EMSCRIPTEN_minor__*100 + __EMSCRIPTEN_tiny__ >= 20005
+void Mesh::multiDrawElementsBaseVertexImplementationANGLE(const GLenum mode, const GLsizei* const count, const GLenum type, const void* const* const indices, const GLsizei drawCount, const GLint* const baseVertex) {
+    /** @todo merge with the allocation in multiDrawImplementationDefault */
+    Containers::ArrayView<GLsizei> instanceCount;
+    Containers::ArrayView<GLuint> baseInstance;
+    Containers::ArrayTuple data{
+        {NoInit, std::size_t(drawCount), instanceCount},
+        {ValueInit, std::size_t(drawCount), baseInstance},
+    };
+    for(GLsizei& i: instanceCount) i = 1;
+
+    glMultiDrawElementsInstancedBaseVertexBaseInstanceANGLE(mode, count, type, indices, instanceCount, baseVertex, baseInstance, drawCount);
+}
+#endif
+
+void Mesh::multiDrawElementsBaseVertexImplementationAssert(GLenum, const GLsizei*, GLenum, const void* const*, GLsizei, const GLint*) {
+    CORRADE_ASSERT_UNREACHABLE("GL::AbstractShaderProgram::draw(): no extension available for indexed mesh multi-draw with base vertex specification", );
+}
+#endif
+
 }}

src/Magnum/GL/Mesh.h

@@ -1195,6 +1195,13 @@ class MAGNUM_GL_EXPORT Mesh: public AbstractObject {
         #endif
         #endif
 
+        #ifdef MAGNUM_TARGET_GLES
+        #if defined(MAGNUM_TARGET_WEBGL) && !defined(MAGNUM_TARGET_GLES2) && __EMSCRIPTEN_major__*10000 + __EMSCRIPTEN_minor__*100 + __EMSCRIPTEN_tiny__ >= 20005
+        static MAGNUM_GL_LOCAL void multiDrawElementsBaseVertexImplementationANGLE(GLenum mode, const GLsizei* count, GLenum type, const void* const* indices, GLsizei drawCount, const GLint* baseVertex);
+        #endif
+        static MAGNUM_GL_LOCAL void     multiDrawElementsBaseVertexImplementationAssert(GLenum, const GLsizei*, GLenum, const void* const*, GLsizei, const GLint*);
+        #endif
+
         /* _id, _primitive, _flags set from constructors */
         GLuint _id;
         MeshPrimitive _primitive;

src/Magnum/GL/MeshView.cpp

@@ -138,25 +138,4 @@ void MeshView::multiDrawImplementationFallback(Containers::ArrayView<const Conta
 }
 #endif
 
-#ifdef MAGNUM_TARGET_GLES
-#if defined(MAGNUM_TARGET_WEBGL) && !defined(MAGNUM_TARGET_GLES2) && __EMSCRIPTEN_major__*10000 + __EMSCRIPTEN_minor__*100 + __EMSCRIPTEN_tiny__ >= 20005
-void MeshView::multiDrawElementsBaseVertexImplementationANGLE(const GLenum mode, const GLsizei* const count, const GLenum type, const void* const* const indices, const GLsizei drawCount, const GLint* const baseVertex) {
-    /** @todo merge with the allocation in multiDrawImplementationDefault */
-    Containers::ArrayView<GLsizei> instanceCount;
-    Containers::ArrayView<GLuint> baseInstance;
-    Containers::ArrayTuple data{
-        {NoInit, std::size_t(drawCount), instanceCount},
-        {ValueInit, std::size_t(drawCount), baseInstance},
-    };
-    for(GLsizei& i: instanceCount) i = 1;
-
-    glMultiDrawElementsInstancedBaseVertexBaseInstanceANGLE(mode, count, type, indices, instanceCount, baseVertex, baseInstance, drawCount);
-}
-#endif
-
-void MeshView::multiDrawElementsBaseVertexImplementationAssert(GLenum, const GLsizei*, GLenum, const void* const*, GLsizei, const GLint*) {
-    CORRADE_ASSERT_UNREACHABLE("GL::AbstractShaderProgram::draw(): no extension available for indexed mesh multi-draw with base vertex specification", );
-}
-#endif
-
 }}

src/Magnum/GL/MeshView.h

@@ -268,13 +268,6 @@ class MAGNUM_GL_EXPORT MeshView {
         static MAGNUM_GL_LOCAL void multiDrawImplementationFallback(Containers::ArrayView<const Containers::Reference<MeshView>> meshes);
         #endif
 
-        #ifdef MAGNUM_TARGET_GLES
-        #if defined(MAGNUM_TARGET_WEBGL) && !defined(MAGNUM_TARGET_GLES2) && __EMSCRIPTEN_major__*10000 + __EMSCRIPTEN_minor__*100 + __EMSCRIPTEN_tiny__ >= 20005
-        static MAGNUM_GL_LOCAL void multiDrawElementsBaseVertexImplementationANGLE(GLenum mode, const GLsizei* count, GLenum type, const void* const* indices, GLsizei drawCount, const GLint* baseVertex);
-        #endif
-        static MAGNUM_GL_LOCAL void     multiDrawElementsBaseVertexImplementationAssert(GLenum, const GLsizei*, GLenum, const void* const*, GLsizei, const GLint*);
-        #endif
-
         Containers::Reference<Mesh> _original;
 
         bool _countSet{};