Browse Source

Shaders: fix assertion in MeshVisualizer.

It would break on GL 2.1 or when instantiating the shader on ES < 3.1
without wireframe enabled.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
c8dfb6789b
  1. 4
      src/Magnum/Shaders/MeshVisualizer.cpp

4
src/Magnum/Shaders/MeshVisualizer.cpp

@ -60,10 +60,10 @@ MeshVisualizer::MeshVisualizer(const Flags flags): flags(flags), transformationP
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
const Version version = Context::current()->supportedVersion({Version::GL320, Version::GL310, Version::GL300, Version::GL210}); 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 #else
const Version version = Context::current()->supportedVersion({Version::GLES310, Version::GLES300, Version::GLES200}); 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 #endif
Shader vert = Implementation::createCompatibilityShader(rs, version, Shader::Type::Vertex); Shader vert = Implementation::createCompatibilityShader(rs, version, Shader::Type::Vertex);

Loading…
Cancel
Save