Fix NPE when uniform buffer is not bound

Author: xCollateral

src/main/java/net/vulkanmod/render/engine/VkCommandEncoder.java

@@ -763,7 +763,6 @@ public boolean trySetup(VkRenderPass renderPass) {
         return bindPipeline(renderPass.pipeline);
     }
 
-    // TODO
     public void setupUniforms(VkRenderPass renderPass) {
         RenderPipeline renderPipeline = renderPass.pipeline;
         EGlProgram glProgram = ExtendedRenderPipeline.of(renderPass.pipeline).getProgram();
@@ -774,6 +773,14 @@ public void setupUniforms(VkRenderPass renderPass) {
             Uniform uniform = glProgram.getUniform(uniformName);
 
             GpuBufferSlice gpuBufferSlice = renderPass.uniforms.get(uniformName);
+
+            // In case uniform buffer is not set, ignore it
+            if (gpuBufferSlice == null) {
+                ubo.setUseGlobalBuffer(true);
+                ubo.setUpdate(false);
+                continue;
+            }
+
             VkGpuBuffer gpuBuffer = (VkGpuBuffer) gpuBufferSlice.buffer();
 
             assert ubo != null;

src/main/java/net/vulkanmod/vulkan/shader/DescriptorSets.java

@@ -74,7 +74,9 @@ private void updateUniforms(UniformBuffer globalUB) {
                 int alignedSize = UniformBuffer.getAlignedSize(ubo.getSize());
                 globalUB.checkCapacity(alignedSize);
 
-                ubo.update(globalUB.getPointer());
+                if (ubo.shouldUpdate()) {
+                    ubo.update(globalUB.getPointer());
+                }
                 globalUB.updateOffset(alignedSize);
 
                 BufferSlice bufferSlice = ubo.getBufferSlice();

src/main/java/net/vulkanmod/vulkan/shader/descriptor/UBO.java

@@ -1,6 +1,5 @@
 package net.vulkanmod.vulkan.shader.descriptor;
 
-import net.vulkanmod.vulkan.memory.buffer.Buffer;
 import net.vulkanmod.vulkan.memory.buffer.BufferSlice;
 import net.vulkanmod.vulkan.shader.layout.AlignedStruct;
 import net.vulkanmod.vulkan.shader.layout.Uniform;
@@ -15,12 +14,14 @@ public class UBO extends AlignedStruct implements Descriptor {
     public final int stages;
     public final BufferSlice bufferSlice;
     private boolean useGlobalBuffer;
+    private boolean update;
 
     public UBO(String name, int binding, int stages, int size, List<Uniform.Info> infoList) {
         super(infoList, size);
         this.name = name;
         this.binding = binding;
         this.stages = stages;
+        this.update = true;
 
         this.bufferSlice = new BufferSlice();
     }
@@ -58,4 +59,12 @@ public boolean useGlobalBuffer() {
     public void setUseGlobalBuffer(boolean useGlobalBuffer) {
         this.useGlobalBuffer = useGlobalBuffer;
     }
+
+    public boolean shouldUpdate() {
+        return update;
+    }
+
+    public void setUpdate(boolean update) {
+        this.update = update;
+    }
 }