Update glow/-extra, adapt to new interface

glow @ 7fc5d391

-Subproject commit 5dfa20c1fbdc7865c3f03f47fac82a5628632a66
+Subproject commit 7fc5d391eda55f383908d24304be8718e636e5fd

glow-extras @ 7cdbf870

-Subproject commit f1bb0619190b2b84693d896ab405d953a23af615
+Subproject commit 7cdbf8701eba1d89880b85ec6055247e9c1a5d55

samples/demo/material/MaterialSample.cc

@@ -13,12 +13,12 @@
 #include <glow/util/DefaultShaderParser.hh>
 
 #include <glow-extras/assimp/Importer.hh>
-#include <glow-extras/pipeline/RenderPipeline.hh>
-#include <glow-extras/pipeline/RenderScene.hh>
-#include <glow-extras/pipeline/stages/StageCamera.hh>
 #include <glow-extras/geometry/Cube.hh>
 #include <glow-extras/geometry/Quad.hh>
 #include <glow-extras/material/IBL.hh>
+#include <glow-extras/pipeline/RenderPipeline.hh>
+#include <glow-extras/pipeline/RenderScene.hh>
+#include <glow-extras/pipeline/stages/StageCamera.hh>
 
 #include <glm/ext.hpp>
 
@@ -70,7 +70,8 @@ void MaterialSample::init()
 {
     glow::warning() << " ---- WARNING ---- ";
     glow::warning() << "This sample was ported from the old rendering pipeline and is obsolete";
-    glow::warning() << "For an up to date way of using GGX+IBL materials with the Pipeline, take a look at wip/RenderingPipelineSample";
+    glow::warning() << "For an up to date way of using GGX+IBL materials with the Pipeline, take a look at "
+                       "wip/RenderingPipelineSample";
     glow::warning() << " ---- WARNING ---- ";
 
     setGui(GlfwApp::Gui::AntTweakBar);
@@ -193,7 +194,7 @@ void MaterialSample::onResize(int w, int h)
     getCamera()->setViewportSize(w, h);
 }
 
-void MaterialSample::setupObjectShader(glow::Program::UsedProgram &shader, glow::pipeline::CameraData const &d)
+void MaterialSample::setupObjectShader(glow::UsedProgram &shader, glow::pipeline::CameraData const &d)
 {
     mMetallic = mIsMetallic ? 1.0f : 0.0f;
 
@@ -263,9 +264,7 @@ void MaterialSample::onRenderOpaquePass(const pipeline::RenderScene &p, const pi
     }
 }
 
-void MaterialSample::onRenderTransparentPass(const pipeline::RenderScene &p,
-                                             const pipeline::RenderStage &s,
-                                             const pipeline::CameraData &d)
+void MaterialSample::onRenderTransparentPass(const pipeline::RenderScene &p, const pipeline::RenderStage &s, const pipeline::CameraData &d)
 {
     if (mAlpha <= 0.999f)
     { // scene

samples/demo/material/MaterialSample.hh

@@ -111,7 +111,7 @@ private:
 
     void ApplyCallback();
     void RecreateIBL();
-    void setupObjectShader(glow::Program::UsedProgram& shader, glow::pipeline::CameraData const& d);
+    void setupObjectShader(glow::UsedProgram& shader, glow::pipeline::CameraData const& d);
 
 protected:
     void init() override;

samples/wip/rendering-pipeline/RenderingPipelineSample.cc

@@ -58,7 +58,7 @@ void RenderingPipelineSample::onGui()
     ImGui::End();
 }
 
-void RenderingPipelineSample::onPerformShadowPass(const RenderScene &, const RenderStage &, const CameraData &d, Program::UsedProgram &shader)
+void RenderingPipelineSample::onPerformShadowPass(const RenderScene &, const RenderStage &, const CameraData &d, UsedProgram &shader)
 {
     drawOpaqueGeometry(shader, d, true);
 }
@@ -192,7 +192,7 @@ void RenderingPipelineSample::initMeshes()
         glm::vec3(.75), .45f, .95f});
 }
 
-void RenderingPipelineSample::drawOpaqueGeometry(Program::UsedProgram &shader, const CameraData &camData, bool zPreOnly)
+void RenderingPipelineSample::drawOpaqueGeometry(UsedProgram &shader, const CameraData &camData, bool zPreOnly)
 {
     for (auto const &mesh : mMeshEntries)
     {

samples/wip/rendering-pipeline/RenderingPipelineSample.hh

@@ -72,7 +72,7 @@ private:
 
     // Meshes
     void initMeshes();
-    void drawOpaqueGeometry(glow::Program::UsedProgram& shader, glow::pipeline::CameraData const& camData, bool zPreOnly = false);
+    void drawOpaqueGeometry(glow::UsedProgram& shader, glow::pipeline::CameraData const& camData, bool zPreOnly = false);
 
 protected:
     void init() override;
@@ -85,7 +85,7 @@ protected:
     void onPerformShadowPass(glow::pipeline::RenderScene const&,
                              glow::pipeline::RenderStage const&,
                              glow::pipeline::CameraData const&,
-                             glow::Program::UsedProgram&) override;
+                             glow::UsedProgram&) override;
     void onRenderDepthPrePass(glow::pipeline::RenderContext&& info) override;
     void onRenderOpaquePass(glow::pipeline::RenderContext&& info) override;
     void onRenderTransparentPass(glow::pipeline::RenderContext&& info) override;