Fix crash on clear when no framebuffer is bound

xCollateral · xCollateral · commit 160fcb19d71b · 2026-02-01T18:58:58.000+01:00
diff --git a/src/main/java/net/vulkanmod/render/engine/VkCommandEncoder.java b/src/main/java/net/vulkanmod/render/engine/VkCommandEncoder.java
@@ -217,7 +217,7 @@ public void clearColorAndDepthTextures(GpuTexture colorAttachment, int clearColo
                 ((VkGpuTexture) depthAttachment).setDepthClearValue((float) clearDepth);
 
                 Framebuffer boundFramebuffer = Renderer.getInstance().getBoundFramebuffer();
-                if (boundFramebuffer.getColorAttachment() == ((VkGpuTexture) colorAttachment).getVulkanImage()
+                if (boundFramebuffer != null && boundFramebuffer.getColorAttachment() == ((VkGpuTexture) colorAttachment).getVulkanImage()
                     && boundFramebuffer.getDepthAttachment() == ((VkGpuTexture) depthAttachment).getVulkanImage())
                 {
                     fbo.clearAttachments();
@@ -238,7 +238,7 @@ public void clearColorAndDepthTextures(GpuTexture colorAttachment, int clearColo
             y0 = framebufferHeight - height - y0;
 
             Framebuffer boundFramebuffer = Renderer.getInstance().getBoundFramebuffer();
-            if (boundFramebuffer.getColorAttachment() == ((VkGpuTexture) colorAttachment).getVulkanImage()
+            if (boundFramebuffer != null && boundFramebuffer.getColorAttachment() == ((VkGpuTexture) colorAttachment).getVulkanImage()
                 && boundFramebuffer.getDepthAttachment() == ((VkGpuTexture) depthAttachment).getVulkanImage())
             {
                 Renderer.clearAttachments(0x4100, x0, y0, width, height);
@@ -257,7 +257,7 @@ public void clearDepthTexture(GpuTexture depthAttachment, double clearDepth) {
         }
         else {
             Framebuffer boundFramebuffer = Renderer.getInstance().getBoundFramebuffer();
-            if (boundFramebuffer.getDepthAttachment() == ((VkGpuTexture) depthAttachment).getVulkanImage()) {
+            if (boundFramebuffer != null && boundFramebuffer.getDepthAttachment() == ((VkGpuTexture) depthAttachment).getVulkanImage()) {
                 VRenderSystem.clearDepth(clearDepth);
                 Renderer.clearAttachments(0x100);
             }

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public void clearColorAndDepthTextures(GpuTexture colorAttachment, int clearColo`
`217`	`217`	`((VkGpuTexture) depthAttachment).setDepthClearValue((float) clearDepth);`
`218`	`218`
`219`	`219`	`Framebuffer boundFramebuffer = Renderer.getInstance().getBoundFramebuffer();`
`220`		`- if (boundFramebuffer.getColorAttachment() == ((VkGpuTexture) colorAttachment).getVulkanImage()`
	`220`	`+ if (boundFramebuffer != null && boundFramebuffer.getColorAttachment() == ((VkGpuTexture) colorAttachment).getVulkanImage()`
`221`	`221`	`&& boundFramebuffer.getDepthAttachment() == ((VkGpuTexture) depthAttachment).getVulkanImage())`
`222`	`222`	`{`
`223`	`223`	`fbo.clearAttachments();`
`@@ -238,7 +238,7 @@ public void clearColorAndDepthTextures(GpuTexture colorAttachment, int clearColo`
`238`	`238`	`y0 = framebufferHeight - height - y0;`
`239`	`239`
`240`	`240`	`Framebuffer boundFramebuffer = Renderer.getInstance().getBoundFramebuffer();`
`241`		`- if (boundFramebuffer.getColorAttachment() == ((VkGpuTexture) colorAttachment).getVulkanImage()`
	`241`	`+ if (boundFramebuffer != null && boundFramebuffer.getColorAttachment() == ((VkGpuTexture) colorAttachment).getVulkanImage()`
`242`	`242`	`&& boundFramebuffer.getDepthAttachment() == ((VkGpuTexture) depthAttachment).getVulkanImage())`
`243`	`243`	`{`
`244`	`244`	`Renderer.clearAttachments(0x4100, x0, y0, width, height);`
`@@ -257,7 +257,7 @@ public void clearDepthTexture(GpuTexture depthAttachment, double clearDepth) {`
`257`	`257`	`}`
`258`	`258`	`else {`
`259`	`259`	`Framebuffer boundFramebuffer = Renderer.getInstance().getBoundFramebuffer();`
`260`		`- if (boundFramebuffer.getDepthAttachment() == ((VkGpuTexture) depthAttachment).getVulkanImage()) {`
	`260`	`+ if (boundFramebuffer != null && boundFramebuffer.getDepthAttachment() == ((VkGpuTexture) depthAttachment).getVulkanImage()) {`
`261`	`261`	`VRenderSystem.clearDepth(clearDepth);`
`262`	`262`	`Renderer.clearAttachments(0x100);`
`263`	`263`	`}`