Improve uniform compatibility in case of no bound buffer

Author: xCollateral

src/main/java/net/vulkanmod/mixin/render/CompositeRenderTypeM.java

@@ -13,6 +13,7 @@
 import net.minecraft.client.renderer.RenderType;
 import net.vulkanmod.render.engine.*;
 import net.vulkanmod.vulkan.Renderer;
+import net.vulkanmod.vulkan.VRenderSystem;
 import net.vulkanmod.vulkan.texture.VTextureSelector;
 import org.joml.Vector3f;
 import org.joml.Vector4f;
@@ -94,6 +95,9 @@ public void draw(MeshData meshData) {
                     }
                 }
 
+                VRenderSystem.applyModelViewMatrix(RenderSystem.getModelViewMatrix());
+                VRenderSystem.calculateMVP();
+
                 renderPass.setIndexBuffer(gpuBuffer2, indexType);
 
                 VkCommandEncoder commandEncoder = (VkCommandEncoder) RenderSystem.getDevice().createCommandEncoder();

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

@@ -793,10 +793,10 @@ public void setupUniforms(VkRenderPass renderPass) {
 
             GpuBufferSlice gpuBufferSlice = renderPass.uniforms.get(uniformName);
 
-            // In case uniform buffer is not set, ignore it
+            // In case uniform buffer is not set, fallback to global buffer
             if (gpuBufferSlice == null) {
                 ubo.setUseGlobalBuffer(true);
-                ubo.setUpdate(false);
+                ubo.setUpdate(true);
                 continue;
             }
 

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

@@ -48,7 +48,7 @@ public class DescriptorSets {
         }
     }
 
-    protected void bindSets(VkCommandBuffer commandBuffer, UniformBuffer uniformBuffer, int bindPoint) {
+    public void bindSets(VkCommandBuffer commandBuffer, UniformBuffer uniformBuffer, int bindPoint) {
         try (MemoryStack stack = stackPush()) {
 
             this.updateUniforms(uniformBuffer);
@@ -62,6 +62,12 @@ protected void bindSets(VkCommandBuffer commandBuffer, UniformBuffer uniformBuff
     private void updateUniforms(UniformBuffer globalUB) {
         int i = 0;
         for (UBO ubo : pipeline.getBuffers()) {
+            // Prevent NPE in case UBO has no bound buffer slice
+            if (ubo.getBufferSlice().getBuffer() == null) {
+                ubo.setUseGlobalBuffer(true);
+                ubo.setUpdate(true);
+            }
+
             boolean useOwnUB = !ubo.useGlobalBuffer();
 
             int offset;

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

@@ -163,7 +163,7 @@ public void scheduleCleanUp() {
 
     public abstract void cleanUp();
 
-    void destroyDescriptorSets() {
+    protected void destroyDescriptorSets() {
         for (DescriptorSets descriptorSets : this.descriptorSets) {
             descriptorSets.cleanUp();
         }
@@ -240,10 +240,8 @@ public void bindDescriptorSets(VkCommandBuffer commandBuffer, UniformBuffer unif
         this.descriptorSets[frame].bindSets(commandBuffer, uniformBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS);
     }
 
-    static long createShaderModule(ByteBuffer spirvCode) {
-
+    protected static long createShaderModule(ByteBuffer spirvCode) {
         try (MemoryStack stack = stackPush()) {
-
             VkShaderModuleCreateInfo createInfo = VkShaderModuleCreateInfo.calloc(stack);
 
             createInfo.sType(VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO);

src/main/java/net/vulkanmod/vulkan/shader/layout/Uniform.java

@@ -34,6 +34,10 @@ public String getName() {
     }
 
     void update(long ptr) {
+        if (this.values == null) {
+            return;
+        }
+
         MappedBuffer src = values.get();
 
         MemoryUtil.memCopy(src.ptr, ptr + this.offset, this.size);