From c8dfb6789b993fe33e08686a425ae5c321d320d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 6 Jul 2015 23:24:10 +0200 Subject: [PATCH] Shaders: fix assertion in MeshVisualizer. It would break on GL 2.1 or when instantiating the shader on ES < 3.1 without wireframe enabled. --- src/Magnum/Shaders/MeshVisualizer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Shaders/MeshVisualizer.cpp b/src/Magnum/Shaders/MeshVisualizer.cpp index 08d2e6e43..e37997423 100644 --- a/src/Magnum/Shaders/MeshVisualizer.cpp +++ b/src/Magnum/Shaders/MeshVisualizer.cpp @@ -60,10 +60,10 @@ MeshVisualizer::MeshVisualizer(const Flags flags): flags(flags), transformationP #ifndef MAGNUM_TARGET_GLES const Version version = Context::current()->supportedVersion({Version::GL320, Version::GL310, Version::GL300, Version::GL210}); - CORRADE_INTERNAL_ASSERT(flags & Flag::NoGeometryShader || version >= Version::GL320); + CORRADE_INTERNAL_ASSERT(!flags || flags & Flag::NoGeometryShader || version >= Version::GL320); #else const Version version = Context::current()->supportedVersion({Version::GLES310, Version::GLES300, Version::GLES200}); - CORRADE_INTERNAL_ASSERT(flags & Flag::NoGeometryShader || version >= Version::GLES310); + CORRADE_INTERNAL_ASSERT(!flags || flags & Flag::NoGeometryShader || version >= Version::GLES310); #endif Shader vert = Implementation::createCompatibilityShader(rs, version, Shader::Type::Vertex);