From 521489ac2e71030cf75da227420350721abf5bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 14 Mar 2023 11:14:34 +0100 Subject: [PATCH] Shaders: don't assert for ARB_uniform_buffer_object presence twice. Done this way only in the Phong shader, everywhere else it's just the MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED() macro. Some WIP code that I forgot to clean up? --- src/Magnum/Shaders/PhongGL.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Magnum/Shaders/PhongGL.cpp b/src/Magnum/Shaders/PhongGL.cpp index 8a67f7430..e3b6c5c52 100644 --- a/src/Magnum/Shaders/PhongGL.cpp +++ b/src/Magnum/Shaders/PhongGL.cpp @@ -156,11 +156,6 @@ PhongGL::CompileState PhongGL::compile(const Configuration& configuration) { const GL::Context& context = GL::Context::current(); - #ifndef MAGNUM_TARGET_GLES - CORRADE_ASSERT(!(configuration.flags() >= Flag::UniformBuffers) || context.isExtensionSupported(), - "Shaders::PhongGL: uniform buffers require" << GL::Extensions::ARB::uniform_buffer_object::string(), CompileState{NoCreate}); - #endif - #ifndef MAGNUM_TARGET_GLES const GL::Version version = context.supportedVersion({GL::Version::GL320, GL::Version::GL310, GL::Version::GL300, GL::Version::GL210}); #else