Implement completion status fallback & fixes

src/Magnum/GL/AbstractShaderProgram.cpp

@@ -605,19 +605,17 @@ bool AbstractShaderProgram::checkLink() {
        be said, handle that as well. */
     Context::current().state().shaderProgram.cleanLogImplementation(message);
 
-    /** @todo update log messages */
-
     /* Show error log */
     if(!success) {
         Error out{Debug::Flag::NoNewlineAtTheEnd};
-        out << "GL::AbstractShaderProgram::link(): linking";
-        out << "failed with the following message:" << Debug::newline << message;
+        out << "GL::AbstractShaderProgram::link(): linking failed with the following message:"
+            << Debug::newline << message;
 
     /* Or just warnings, if any */
     } else if(!message.empty()) {
         Warning out{Debug::Flag::NoNewlineAtTheEnd};
-        out << "GL::AbstractShaderProgram::link(): linking";
-        out << "succeeded with the following message:" << Debug::newline << message;
+        out << "GL::AbstractShaderProgram::link(): linking succeeded with the following message:"
+            << Debug::newline << message;
     }
 
     return success;
@@ -632,7 +630,7 @@ bool AbstractShaderProgram::link(std::initializer_list<Containers::Reference<Abs
 
 bool AbstractShaderProgram::isLinkFinished() {
     GLint success;
-    glGetProgramiv(_id, GL_COMPLETION_STATUS_KHR, &success);
+    Context::current().state().shaderProgram.completionStatusImplementation(_id, GL_COMPLETION_STATUS_KHR, &success);
     return success == GL_TRUE;
 }
 
@@ -650,6 +648,10 @@ void AbstractShaderProgram::cleanLogImplementationAngle(std::string& message) {
 }
 #endif
 
+void AbstractShaderProgram::completionStatusImplementationFallback(GLuint, GLenum, GLint* value) {
+    *value = GL_TRUE;
+}
+
 Int AbstractShaderProgram::uniformLocationInternal(const Containers::ArrayView<const char> name) {
     const GLint location = glGetUniformLocation(_id, name);
     if(location == -1)

src/Magnum/GL/AbstractShaderProgram.h

@@ -1692,6 +1692,8 @@ class MAGNUM_GL_EXPORT AbstractShaderProgram: public AbstractObject {
         static MAGNUM_GL_LOCAL void cleanLogImplementationAngle(std::string& message);
         #endif
 
+        static MAGNUM_GL_LOCAL void completionStatusImplementationFallback(GLuint, GLenum, GLint*);
+
         MAGNUM_GL_LOCAL static void use(GLuint id);
         void use();
 

src/Magnum/GL/Implementation/ShaderProgramState.cpp

@@ -78,6 +78,13 @@ ShaderProgramState::ShaderProgramState(Context& context, Containers::StaticArray
         cleanLogImplementation = &AbstractShaderProgram::cleanLogImplementationNoOp;
     }
 
+    if(context.isExtensionSupported<Extensions::KHR::parallel_shader_compile>()) {
+        extensions[Extensions::KHR::parallel_shader_compile::Index] = Extensions::KHR::parallel_shader_compile::string();
+        completionStatusImplementation = glGetProgramiv;
+    } else {
+        completionStatusImplementation = &AbstractShaderProgram::completionStatusImplementationFallback;
+    }
+
     #ifndef MAGNUM_TARGET_WEBGL
     #ifndef MAGNUM_TARGET_GLES2
     #ifndef MAGNUM_TARGET_GLES

src/Magnum/GL/Implementation/ShaderProgramState.h

@@ -47,6 +47,7 @@ struct ShaderProgramState {
     void(AbstractShaderProgram::*transformFeedbackVaryingsImplementation)(Containers::ArrayView<const std::string>, AbstractShaderProgram::TransformFeedbackBufferMode);
     #endif
     void(*cleanLogImplementation)(std::string&);
+    void(*completionStatusImplementation)(GLuint, GLenum, GLint* value);
 
     #ifndef MAGNUM_TARGET_WEBGL
     void(APIENTRY *uniform1fvImplementation)(GLuint, GLint, GLsizei, const GLfloat*);

src/Magnum/GL/Implementation/ShaderState.cpp

@@ -31,12 +31,13 @@
 
 #include "Magnum/GL/Context.h"
 #include "Magnum/GL/Shader.h"
+#include "Magnum/GL/Extensions.h"
 
 namespace Magnum { namespace GL { namespace Implementation {
 
 using namespace Containers::Literals;
 
-ShaderState::ShaderState(Context& context, Containers::StaticArrayView<Implementation::ExtensionCount, const char*>):
+ShaderState::ShaderState(Context& context, Containers::StaticArrayView<Implementation::ExtensionCount, const char*> extensions):
     maxVertexOutputComponents{}, maxFragmentInputComponents{},
     #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL)
     maxTessellationControlInputComponents{}, maxTessellationControlOutputComponents{}, maxTessellationControlTotalOutputComponents{}, maxTessellationEvaluationInputComponents{}, maxTessellationEvaluationOutputComponents{}, maxGeometryInputComponents{}, maxGeometryOutputComponents{}, maxGeometryTotalOutputComponents{}, maxAtomicCounterBuffers{}, maxCombinedAtomicCounterBuffers{}, maxAtomicCounters{}, maxCombinedAtomicCounters{}, maxImageUniforms{}, maxCombinedImageUniforms{}, maxShaderStorageBlocks{}, maxCombinedShaderStorageBlocks{},
@@ -68,9 +69,12 @@ ShaderState::ShaderState(Context& context, Containers::StaticArrayView<Implement
         cleanLogImplementation = &Shader::cleanLogImplementationNoOp;
     }
 
-    /* Needed only if neither of these ifdefs above hits, but I won't bother
-       crafting the preprocessor logic for this. */
-    static_cast<void>(context);
+     if(context.isExtensionSupported<GL::Extensions::KHR::parallel_shader_compile>()) {
+        extensions[Extensions::KHR::parallel_shader_compile::Index] = Extensions::KHR::parallel_shader_compile::string();
+        completionStatusImplementation = glGetShaderiv;
+    } else {
+        completionStatusImplementation = &Shader::completionStatusImplementationFallback;
+    }
 }
 
 }}}

src/Magnum/GL/Implementation/ShaderState.h

@@ -53,6 +53,7 @@ struct ShaderState {
 
     void(Shader::*addSourceImplementation)(std::string);
     void(*cleanLogImplementation)(std::string&);
+    void(*completionStatusImplementation)(GLuint, GLenum, GLint* value);
 
     GLint maxVertexOutputComponents,
         maxFragmentInputComponents;

src/Magnum/GL/Shader.cpp

@@ -782,19 +782,17 @@ bool Shader::checkCompile() { /* After compilation phase, check status of all sh
        be said, handle that as well. */
     Context::current().state().shader.cleanLogImplementation(message);
 
-    /** @todo update log messages */
-
     /* Show error log */
     if(!success) {
         Error out{Debug::Flag::NoNewlineAtTheEnd};
-        out << "GL::Shader::compile(): compilation of" << shaderName(_type) << "shader";
-        out << "failed with the following message:" << Debug::newline << message;
+        out << "GL::Shader::compile(): compilation of" << shaderName(_type) << "shader"
+            << "failed with the following message:" << Debug::newline << message;
 
     /* Or just warnings, if any */
     } else if(!message.empty()) {
         Warning out{Debug::Flag::NoNewlineAtTheEnd};
-        out << "GL::Shader::compile(): compilation of" << shaderName(_type) << "shader";
-        out << "succeeded with the following message:" << Debug::newline << message;
+        out << "GL::Shader::compile(): compilation of" << shaderName(_type) << "shader"
+            << "succeeded with the following message:" << Debug::newline << message;
     }
 
     return success;
@@ -810,7 +808,7 @@ bool Shader::compile(std::initializer_list<Containers::Reference<Shader>> shader
 
 bool Shader::isCompileFinished() {
     GLint success;
-    glGetShaderiv(_id, GL_COMPLETION_STATUS_KHR, &success);
+    Context::current().state().shader.completionStatusImplementation(_id, GL_COMPLETION_STATUS_KHR, &success);
     return success == GL_TRUE;
 }
 
@@ -822,6 +820,10 @@ void Shader::cleanLogImplementationIntelWindows(std::string& message) {
 }
 #endif
 
+void Shader::completionStatusImplementationFallback(GLuint, GLenum, GLint* value) {
+    *value = GL_TRUE;
+}
+
 #ifndef DOXYGEN_GENERATING_OUTPUT
 Debug& operator<<(Debug& debug, const Shader::Type value) {
     debug << "GL::Shader::Type" << Debug::nospace;

src/Magnum/GL/Shader.h

@@ -676,6 +676,8 @@ class MAGNUM_GL_EXPORT Shader: public AbstractObject {
         static MAGNUM_GL_LOCAL void cleanLogImplementationIntelWindows(std::string& message);
         #endif
 
+        static MAGNUM_GL_LOCAL void completionStatusImplementationFallback(GLuint, GLenum, GLint*);
+
         Type _type;
         GLuint _id;
 

src/Magnum/Shaders/FlatGL.cpp

@@ -208,33 +208,33 @@ template<UnsignedInt dimensions> typename FlatGL<dimensions>::CompileState FlatG
     if(!context.isExtensionSupported<GL::Extensions::ARB::explicit_attrib_location>(version))
     #endif
     {
-        cs.bindAttributeLocation(Position::Location, "position");
+        out.bindAttributeLocation(Position::Location, "position");
         if(flags & Flag::Textured
             #ifndef MAGNUM_TARGET_GLES2
             || flags >= Flag::ObjectIdTexture
             #endif
         )
-            cs.bindAttributeLocation(TextureCoordinates::Location, "textureCoordinates");
+            out.bindAttributeLocation(TextureCoordinates::Location, "textureCoordinates");
         if(flags & Flag::VertexColor)
-            cs.bindAttributeLocation(Color3::Location, "vertexColor"); /* Color4 is the same */
+            out.bindAttributeLocation(Color3::Location, "vertexColor"); /* Color4 is the same */
         #ifndef MAGNUM_TARGET_GLES2
         if(flags & Flag::ObjectId) {
-            cs.bindFragmentDataLocation(ColorOutput, "color");
-            cs.bindFragmentDataLocation(ObjectIdOutput, "objectId");
+            out.bindFragmentDataLocation(ColorOutput, "color");
+            out.bindFragmentDataLocation(ObjectIdOutput, "objectId");
         }
         if(flags >= Flag::InstancedObjectId)
-            cs.bindAttributeLocation(ObjectId::Location, "instanceObjectId");
+            out.bindAttributeLocation(ObjectId::Location, "instanceObjectId");
         #endif
         if(flags & Flag::InstancedTransformation)
-            cs.bindAttributeLocation(TransformationMatrix::Location, "instancedTransformationMatrix");
+            out.bindAttributeLocation(TransformationMatrix::Location, "instancedTransformationMatrix");
         if(flags >= Flag::InstancedTextureOffset)
-            cs.bindAttributeLocation(TextureOffset::Location, "instancedTextureOffset");
+            out.bindAttributeLocation(TextureOffset::Location, "instancedTextureOffset");
     }
     #endif
 
     out.submitLink();
 
-    return CompileState{std::move(out), std::move()};
+    return CompileState{std::move(out), std::move(vert), std::move(frag), version};
 }
 
 template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(CompileState&& cs)
@@ -305,6 +305,9 @@ template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(CompileState&& cs)
         /* Object ID is zero by default */
     }
     #endif
+
+    static_cast<void>(version);
+    static_cast<void>(context);
 }
 
 template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(Flags flags

src/Magnum/Shaders/FlatGL.h

@@ -603,7 +603,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT FlatGL: public GL::
          */
         explicit FlatGL(NoCreateT) noexcept: GL::AbstractShaderProgram{NoCreate} {}
 
-        struct CompileState;
+        class CompileState;
 
         explicit FlatGL(CompileState&& cs);
 
@@ -1053,13 +1053,15 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT FlatGL: public GL::
 };
 
 template<UnsignedInt dimensions> class FlatGL<dimensions>::CompileState : public FlatGL<dimensions> {
+public:
+    using FlatGL::isLinkFinished;
+
 private:
     friend class FlatGL;
-    using FlatGL::isLinkFinished;
 
     CompileState(NoCreateT) : FlatGL(NoCreate), _vert{NoCreate}, _frag{NoCreate} {}
 
-    CompileState(FlatGL<dimensions>&& shader, GL:Shader&& vert, GL::Shader&& frag, GL::Version version) :
+    CompileState(FlatGL<dimensions>&& shader, GL::Shader&& vert, GL::Shader&& frag, GL::Version version) :
         FlatGL<dimensions>{std::move(shader)}, _vert{std::move(vert)}, _frag{std::move(frag)}, _version{version} {}
 
     GL::Shader _vert, _frag;