From 1bdae5fdddd9781208e039290bf41a896e9053c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 16 Jan 2023 13:22:15 +0100 Subject: [PATCH] Shaders: properly check for EXT_gpu_shader4 if ObjectId is enabled. I was checking many things but not this one. --- src/Magnum/Shaders/FlatGL.cpp | 2 ++ src/Magnum/Shaders/MeshVisualizerGL.cpp | 2 ++ src/Magnum/Shaders/PhongGL.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/Magnum/Shaders/FlatGL.cpp b/src/Magnum/Shaders/FlatGL.cpp index 81ad650d9..cc954d502 100644 --- a/src/Magnum/Shaders/FlatGL.cpp +++ b/src/Magnum/Shaders/FlatGL.cpp @@ -111,6 +111,8 @@ template typename FlatGL::CompileState FlatG #endif #ifndef MAGNUM_TARGET_GLES + if(configuration.flags() >= Flag::ObjectId) + MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::EXT::gpu_shader4); if(configuration.flags() >= Flag::UniformBuffers) MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::ARB::uniform_buffer_object); #endif diff --git a/src/Magnum/Shaders/MeshVisualizerGL.cpp b/src/Magnum/Shaders/MeshVisualizerGL.cpp index e6ebe39fb..45818cd45 100644 --- a/src/Magnum/Shaders/MeshVisualizerGL.cpp +++ b/src/Magnum/Shaders/MeshVisualizerGL.cpp @@ -103,6 +103,8 @@ void MeshVisualizerGLBase::assertExtensions(const FlagsBase flags) { #endif #ifndef MAGNUM_TARGET_GLES + if(flags >= FlagBase::ObjectId) + MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::EXT::gpu_shader4); if(flags >= FlagBase::UniformBuffers) MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::ARB::uniform_buffer_object); #endif diff --git a/src/Magnum/Shaders/PhongGL.cpp b/src/Magnum/Shaders/PhongGL.cpp index 55873012c..f3c495855 100644 --- a/src/Magnum/Shaders/PhongGL.cpp +++ b/src/Magnum/Shaders/PhongGL.cpp @@ -126,6 +126,8 @@ PhongGL::CompileState PhongGL::compile(const Configuration& configuration) { #endif #ifndef MAGNUM_TARGET_GLES + if(configuration.flags() >= Flag::ObjectId) + MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::EXT::gpu_shader4); if(configuration.flags() >= Flag::UniformBuffers) MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::ARB::uniform_buffer_object); #endif