Merge pull request #25 from CapsCollective/feature/vulkan-shader

Refactored the Pipeline, Shader, and Material classes

Author: Raelr

engine/render/assets/shaders/billboard.vert

@@ -24,12 +24,12 @@ struct BillboardData
     vec3 scale;
 };
 
-layout (set = 0, binding = 0) uniform GlobalData {
+layout (binding = 0) uniform GlobalData {
     CameraData cameraData;
     LightData lightData;
 } globalData;
 
-layout (std140, set = 1, binding = 1) readonly buffer ObjectBuffer {
+layout (std140, binding = 1) readonly buffer ObjectBuffer {
     BillboardData data[];
 } objectBuffer;
 

engine/render/assets/shaders/diffuseFragShader.frag

@@ -19,7 +19,7 @@ struct LightData
     vec3 position;
 };
 
-layout (set = 1, binding = 1) uniform GlobalData {
+layout (binding = 1) uniform GlobalData {
     CameraData cameraData;
     LightData lightData;
 } globalData;

engine/render/assets/shaders/line.frag

@@ -1,9 +1,9 @@
 #version 450
 
-layout(location = 0) in vec3 fragColor;
+layout(location = 0) in vec4 fragColor;
 
 layout(location = 0) out vec4 outColor;
 
 void main() {
-    outColor = vec4(fragColor, 1.0);
+    outColor = fragColor;
 }

engine/render/assets/shaders/line.vert

@@ -1,9 +1,9 @@
 #version 450
 
 layout(location = 0) in vec3 position;
-layout(location = 1) in vec3 colour;
+layout(location = 1) in vec4 colour;
 
-layout(location = 0) out vec3 outColour;
+layout(location = 0) out vec4 outColour;
 
 struct CameraData
 {
@@ -18,7 +18,7 @@ struct LightData
     vec3 position;
 };
 
-layout (set = 0, binding = 0) uniform GlobalData {
+layout (binding = 0) uniform GlobalData {
     CameraData cameraData;
     LightData lightData;
 } globalData;

engine/render/assets/shaders/simpleShader.vert

@@ -29,11 +29,11 @@ struct LightData
     vec3 position;
 };
 
-layout (std140, set = 0, binding = 0) readonly buffer ObjectBuffer {
+layout (std140, binding = 0) readonly buffer ObjectBuffer {
     ObjectData objects[];
 } objectBuffer;
 
-layout (set = 1, binding = 1) uniform GlobalData {
+layout (binding = 1) uniform GlobalData {
     CameraData cameraData;
     LightData lightData;
 } globalData;

engine/render/assets/shaders/simpleShader2D.vert

@@ -6,7 +6,7 @@ layout(location = 1) in vec3 color;
 
 layout(location = 0) out vec3 fragColor;
 
-layout (std140, set = 0, binding = 0) readonly buffer Transforms{
+layout (std140, binding = 0) readonly buffer Transforms{
     mat4 transforms[];
 } transforms;
 
@@ -16,7 +16,7 @@ struct CameraData
     mat4 viewMatrix;
 };
 
-layout (set = 1, binding = 1) uniform GlobalData {
+layout (binding = 1) uniform GlobalData {
     CameraData cameraData;
 } globalData;
 

engine/render/renderer/Renderer.cpp

@@ -28,10 +28,10 @@ Renderer::Renderer(Window& window) : window {window}
                  Window::GetRequiredExtensions,
                  Window::CreateWindowSurface);
 
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 10);
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 10);
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 10);
-    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, 10);
+    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024);
+    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1024);
+    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1024);
+    DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, 1024);
 
     DescriptorPool::BuildPool();
 
@@ -50,12 +50,10 @@ Renderer::~Renderer()
 
 void Renderer::DrawFrame()
 {
-    auto commandBuffer = commandBuffers.GetActiveCommandBuffer();
-
     Renderer2D::GlobalData global2DData = {projection};
 
-    Renderer3D::Render(commandBuffer, projection);
-    Renderer2D::Render(commandBuffer, global2DData);
+    Renderer3D::Render(commandBuffers, projection);
+    Renderer2D::Render(commandBuffers, global2DData);
 }
 
 void Renderer::RecreateSwapChain()

engine/render/renderer/Renderer.h

@@ -13,9 +13,7 @@
 
 #include "descriptor/DescriptorPool.h"
 #include "lights/PointLight.h"
-#include "material/Material.h"
 #include "model/Model.h"
-#include "pipeline/Pipeline.h"
 #include "render/renderer/platform/vulkan/CommandBuffer.h"
 #include "render/renderer/platform/vulkan/Context.h"
 #include "render/window/Window.h"
@@ -65,6 +63,11 @@ class Renderer
         return instance;
     }
 
+    static uint32_t GetCurrentFrameIndex()
+    {
+        return currentFrameIndex;
+    }
+
 private:
 
     static Renderer* instance;