From 894a60607541541df3384d5637f1aeb2410c94b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 30 Jan 2022 16:59:51 +0100 Subject: [PATCH] Shaders: properly hide functions not available on ES2. Without this, ES2 compilation on MSVC failed, I suppose due to MSVC unconditionally instantiating inline functions even if never called. --- src/Magnum/Shaders/MeshVisualizerGL.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Magnum/Shaders/MeshVisualizerGL.h b/src/Magnum/Shaders/MeshVisualizerGL.h index 08c095338..96a237634 100644 --- a/src/Magnum/Shaders/MeshVisualizerGL.h +++ b/src/Magnum/Shaders/MeshVisualizerGL.h @@ -78,9 +78,11 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizerGLBase: public GL::AbstractShaderProgr MAGNUM_SHADERS_LOCAL GL::Version setupShaders(GL::Shader& vert, GL::Shader& frag, const Utility::Resource& rs) const; + #ifndef MAGNUM_TARGET_GLES2 MeshVisualizerGLBase& setTextureMatrix(const Matrix3& matrix); MeshVisualizerGLBase& setTextureLayer(UnsignedInt layer); MeshVisualizerGLBase& setObjectId(UnsignedInt id); + #endif MeshVisualizerGLBase& setColor(const Color4& color); MeshVisualizerGLBase& setWireframeColor(const Color4& color); MeshVisualizerGLBase& setWireframeWidth(Float width); @@ -589,6 +591,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizerGL2D: public Implementation::MeshVisua */ MeshVisualizerGL2D& setViewportSize(const Vector2& size); + #ifndef MAGNUM_TARGET_GLES2 /** * @brief Set object ID * @return Reference to self (for method chaining) @@ -610,6 +613,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizerGL2D: public Implementation::MeshVisua MeshVisualizerGL2D& setObjectId(UnsignedInt id) { return static_cast(Implementation::MeshVisualizerGLBase::setObjectId(id)); } + #endif /** * @brief Set base object color @@ -1878,6 +1882,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizerGL3D: public Implementation::MeshVisua */ MeshVisualizerGL3D& setViewportSize(const Vector2& size); + #ifndef MAGNUM_TARGET_GLES2 /** * @brief Set object ID * @return Reference to self (for method chaining) @@ -1899,6 +1904,7 @@ class MAGNUM_SHADERS_EXPORT MeshVisualizerGL3D: public Implementation::MeshVisua MeshVisualizerGL3D& setObjectId(UnsignedInt id) { return static_cast(Implementation::MeshVisualizerGLBase::setObjectId(id)); } + #endif /** * @brief Set base object color