Implemented proper view/proj matrix handling for ForwardPipeline

pipeline/lava-extras/pipeline/ForwardRenderingPipeline.cc

 #include "ForwardRenderingPipeline.hh"
 
+
 #include <glm/glm.hpp>
+#include <glm/ext.hpp>
+
 
 #include <lava/objects/RenderPass.hh>
+#include <lava/objects/Buffer.hh>
 #include <lava/objects/Framebuffer.hh>
 #include <lava/objects/GraphicsPipeline.hh>
 #include <lava/objects/Image.hh>
@@ -12,19 +16,16 @@
 #include <lava/objects/DescriptorSet.hh>
 #include <lava/raii/ActiveRenderPass.hh>
 
+#include <lava/createinfos/Buffers.hh>
 #include <lava/createinfos/Images.hh>
 #include <lava/createinfos/RenderPassCreateInfo.hh>
 #include <lava/createinfos/PipelineShaderStageCreateInfo.hh>
 #include <lava/createinfos/Sampler.hh>
-
-#include <lava-extras/camera/FixedCamera.hh>
-#include <lava-extras/camera/GenericCamera.hh>
-
-#include <glm/ext.hpp>
 #include <lava/createinfos/DescriptorSetLayoutCreateInfo.hh>
 
 #include <lava-extras/pack/pack.hh>
 
+
 using namespace lava;
 using namespace lava::pipeline;
 
@@ -87,6 +88,26 @@ ForwardRenderingPipeline::ForwardRenderingPipeline (
         info.stage(1).specialize(0, true); // Enable FXAA
         mPipelineOutputFXAA = mPassOutput->createPipeline(0, info);
     }
+
+    {
+        mViewProjBuffer =
+            mDevice->createBuffer(
+                    lava::uniformBuffer( sizeof(ViewProjMatrixData) )
+                    );
+
+        mViewProjBuffer->keepStagingBuffer();
+        mViewProjBuffer->realizeVRAM();
+
+        auto dslinfo = DescriptorSetLayoutCreateInfo{};
+        dslinfo.addUniformBuffer(vk::ShaderStageFlagBits::eAllGraphics);
+
+        mViewProjDescriptorSetLayout =
+            mDevice->createDescriptorSetLayout(dslinfo);
+
+        mViewProjDescriptor = mViewProjDescriptorSetLayout->createDescriptorSet();
+        mViewProjDescriptor->writeUniformBuffer(mViewProjBuffer, 0);
+    }
+
 }
 
 void ForwardRenderingPipeline::resize(int w, int h) {
@@ -118,7 +139,7 @@ void ForwardRenderingPipeline::resize(int w, int h) {
 }
 
 void
-ForwardRenderingPipeline::updateMatrices (
+ForwardRenderingPipeline::updateViewProjMatrices (
         RecordingCommandBuffer &cmd,
         glm::mat4 view,
         glm::mat4 proj
@@ -126,6 +147,15 @@ ForwardRenderingPipeline::updateMatrices (
 {
     mView = view;
     mProj = proj;
+
+    ViewProjMatrixData matrixData {
+        view,
+        proj
+    };
+
+    mViewProjBuffer->setDataVRAM(
+                &matrixData, sizeof(matrixData), cmd
+                );
 }
 
 
@@ -169,3 +199,18 @@ ForwardRenderingPipeline::render (
         sub.draw(3);
     }
 }
+
+
+
+const SharedDescriptorSet
+&ForwardRenderingPipeline::getViewProjDescriptor() const
+{
+    return mViewProjDescriptor;
+}
+
+
+const SharedDescriptorSetLayout &
+ForwardRenderingPipeline::getViewProjDescriptorSetLayout() const
+{
+    return mViewProjDescriptorSetLayout;
+}

pipeline/lava-extras/pipeline/ForwardRenderingPipeline.hh

@@ -10,6 +10,11 @@
 
 namespace lava {
 
+struct ViewProjMatrixData {
+    glm::mat4x4 view;
+    glm::mat4x4 proj;
+};
+
 namespace pipeline {
 /**
  * A minimal Forward Rendering Pipeline with support for FXAA.
@@ -63,10 +68,15 @@ class ForwardRenderingPipeline {
     SharedGraphicsPipeline mPipelineOutputFXAA;
     SharedGraphicsPipeline mPipelineOutputNoFXAA;
 
-    // === Descriptor Sets
+    // === Descriptor Sets ===
     SharedDescriptorSetLayout mOutputDescriptorLayout;
     SharedDescriptorSet mOutputDescriptor;
 
+    // === View./Proj. Matrices ===
+    SharedBuffer mViewProjBuffer;
+    SharedDescriptorSetLayout mViewProjDescriptorSetLayout;
+    SharedDescriptorSet mViewProjDescriptor;
+
     // === SETTINGS ===
     bool mFXAA = true;
 
@@ -99,7 +109,7 @@ class ForwardRenderingPipeline {
 
 
     void
-    updateMatrices (
+    updateViewProjMatrices (
             RecordingCommandBuffer &cmd,
             glm::mat4 view,
             glm::mat4 proj
@@ -141,6 +151,21 @@ class ForwardRenderingPipeline {
         return {mPassForward, 0};
     }
 
+
+    SharedBuffer const
+    &getViewProjBuffer() const
+    {
+        return mViewProjBuffer;
+    }
+
+
+    SharedDescriptorSet const
+    &getViewProjDescriptor() const;
+
+
+    SharedDescriptorSetLayout const&
+    getViewProjDescriptorSetLayout() const;
+
 };
 }
 }