Improve immediate buffers compatibility

Author: xCollateral

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

@@ -106,8 +106,8 @@ public void draw(MeshData meshData) {
             VRenderSystem.applyModelViewMatrix(RenderSystem.getModelViewMatrix());
             VRenderSystem.calculateMVP();
 
-            renderPass.setIndexBuffer(gpuBuffer2, indexType);
-//                renderPass.drawIndexed(0, 0, meshData.drawState().indexCount(), 1);
+//            renderPass.setIndexBuffer(gpuBuffer2, indexType);
+//            renderPass.drawIndexed(0, 0, meshData.drawState().indexCount(), 1);
 
             VkCommandEncoder commandEncoder = (VkCommandEncoder) RenderSystem.getDevice().createCommandEncoder();
             commandEncoder.trySetup((VkRenderPass) renderPass);

src/main/java/net/vulkanmod/mixin/render/buffer/VertexFormatMixin.java

@@ -0,0 +1,33 @@
+package net.vulkanmod.mixin.render.buffer;
+
+import com.mojang.blaze3d.buffers.GpuBuffer;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import net.vulkanmod.vulkan.Renderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+
+import java.nio.ByteBuffer;
+
+@Mixin(VertexFormat.class)
+public class VertexFormatMixin {
+
+    @Overwrite
+    public GpuBuffer uploadImmediateVertexBuffer(ByteBuffer byteBuffer) {
+        var buffer = Renderer.getDrawer().getGpuBuffers().getVertexBuffer();
+        buffer.getBuffer().copyBuffer(byteBuffer, byteBuffer.remaining());
+        int currentOffset = Math.toIntExact(buffer.getBuffer().getOffset());
+
+        buffer.setOffset(currentOffset);
+        return buffer;
+    }
+
+    @Overwrite
+    public GpuBuffer uploadImmediateIndexBuffer(ByteBuffer byteBuffer) {
+        var buffer = Renderer.getDrawer().getGpuBuffers().getIndexBuffer();
+        buffer.getBuffer().copyBuffer(byteBuffer, byteBuffer.remaining());
+        int currentOffset = Math.toIntExact(buffer.getBuffer().getOffset());
+
+        buffer.setOffset(currentOffset);
+        return buffer;
+    }
+}

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

@@ -21,6 +21,8 @@ public class VkGpuBuffer extends GpuBuffer {
 
     Buffer buffer;
 
+    int offset;
+
     protected VkGpuBuffer(VkDebugLabel debugLabel, @Nullable Supplier<String> supplier, int usage, long size) {
         super(usage, size);
         this.label = supplier;
@@ -55,6 +57,13 @@ protected VkGpuBuffer(VkDebugLabel debugLabel, @Nullable Supplier<String> suppli
         this.buffer.createBuffer(this.size());
     }
 
+    protected VkGpuBuffer(Buffer buffer) {
+        super(buffer.usage, buffer.getBufferSize());
+
+        this.label = null;
+        this.buffer = buffer;
+    }
+
     @Override
     public boolean isClosed() {
         return this.closed;
@@ -73,6 +82,10 @@ public Buffer getBuffer() {
         return buffer;
     }
 
+    public void setOffset(int offset) {
+        this.offset = offset;
+    }
+
     public static int bufferUsageToGlEnum(int i) {
         boolean stream = (i & 4) != 0;
         // Draw
@@ -87,6 +100,10 @@ else if ((i & 1) != 0) {
         }
     }
 
+    public static VkGpuBuffer from(Buffer buffer) {
+        return new VkGpuBuffer(buffer);
+    }
+
     @Environment(EnvType.CLIENT)
     public static class MappedView implements GpuBuffer.MappedView {
         private final int target;

src/main/java/net/vulkanmod/vulkan/Drawer.java

@@ -1,6 +1,7 @@
 package net.vulkanmod.vulkan;
 
 import com.mojang.blaze3d.vertex.VertexFormat;
+import net.vulkanmod.render.engine.VkGpuBuffer;
 import net.vulkanmod.vulkan.memory.*;
 import net.vulkanmod.vulkan.memory.buffer.Buffer;
 import net.vulkanmod.vulkan.memory.buffer.IndexBuffer;
@@ -31,6 +32,8 @@ public class Drawer {
     private VertexBuffer[] vertexBuffers;
     private IndexBuffer[] indexBuffers;
 
+    private final GpuBuffers gpuBuffers = new GpuBuffers();
+
     private final AutoIndexBuffer quadsIndexBuffer;
     private final AutoIndexBuffer quadsIntIndexBuffer;
     private final AutoIndexBuffer linesIndexBuffer;
@@ -82,6 +85,8 @@ public void createResources(int framesNum) {
         }
         this.uniformBuffers = new UniformBuffer[framesNum];
         Arrays.setAll(this.uniformBuffers, i -> new UniformBuffer(INITIAL_UB_SIZE, MemoryTypes.HOST_MEM));
+
+        this.getGpuBuffers().createBuffers(this.vertexBuffers, this.indexBuffers);
     }
 
     public void resetBuffers(int currentFrame) {
@@ -212,4 +217,35 @@ public AutoIndexBuffer getAutoIndexBuffer(VertexFormat.Mode mode, int vertexCoun
             case TRIANGLES, DEBUG_LINES -> null;
 		};
     }
+
+    public GpuBuffers getGpuBuffers() {
+        return gpuBuffers;
+    }
+
+    public class GpuBuffers {
+        VkGpuBuffer[] vertexBuffers;
+        VkGpuBuffer[] indexBuffers;
+
+        public void createBuffers(VertexBuffer[] vertexBuffers, IndexBuffer[] indexBuffers) {
+            this.vertexBuffers = new VkGpuBuffer[vertexBuffers.length];
+
+            for (int i = 0; i < vertexBuffers.length; i++) {
+                this.vertexBuffers[i] = VkGpuBuffer.from(vertexBuffers[i]);
+            }
+
+            this.indexBuffers = new VkGpuBuffer[indexBuffers.length];
+
+            for (int i = 0; i < vertexBuffers.length; i++) {
+                this.indexBuffers[i] = VkGpuBuffer.from(indexBuffers[i]);
+            }
+        }
+
+        public VkGpuBuffer getVertexBuffer() {
+            return vertexBuffers[Drawer.this.currentFrame];
+        }
+
+        public VkGpuBuffer getIndexBuffer() {
+            return indexBuffers[Drawer.this.currentFrame];
+        }
+    }
 }

src/main/resources/vulkanmod.mixins.json

@@ -51,6 +51,7 @@
     "render.RenderTypeM",
     "render.biome.BiomeManagerM",
     "render.block.BakedQuadM",
+    "render.buffer.VertexFormatMixin",
     "render.clouds.LevelRendererM",
     "render.color.BlockColorsM",
     "render.entity.EntityRendererM",