替换 BlazeRod 内自行扩展的接口为 1.21.7 新加入的接口

Author: fifth-light

blazerod/render/src/main/java/top/fifthlight/blazerod/extension/CommandEncoderExt.java

@@ -10,6 +10,4 @@ enum ClearType {
     }
 
     void blazerod$clearBuffer(GpuBufferSlice slice, ClearType clearType);
-
-    void blazerod$copyBuffer(GpuBufferSlice target, GpuBufferSlice source);
 }

blazerod/render/src/main/java/top/fifthlight/blazerod/extension/internal/gl/BufferManagerExtInternal.java

@@ -5,5 +5,4 @@
 public interface BufferManagerExtInternal {
     boolean blazerod$isGlClearBufferObjectEnabled();
     void blazerod$clearBufferData(int buffer, int offset, int size, ClearType clearType);
-    void blazerod$copyBuffer(int target, int source, int targetOffset, int sourceOffset, int size);
 }

blazerod/render/src/main/java/top/fifthlight/blazerod/helper/gl/GlStateManagerHelper.java

@@ -9,9 +9,4 @@ public static void _glDeleteVertexArrays(int array) {
         RenderSystem.assertOnRenderThread();
         GL30.glDeleteVertexArrays(array);
     }
-
-    public static void _glCopyBufferSubData(int readTarget, int writeTarget, int readOffset, int writeOffset, int size) {
-        RenderSystem.assertOnRenderThread();
-        GL31.glCopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
-    }
 }

blazerod/render/src/main/java/top/fifthlight/blazerod/mixin/gl/BufferManagerMixin.java

@@ -52,11 +52,6 @@ private abstract static class ARBBufferManagerMixin implements BufferManagerExtI
             }
             ARBDirectStateAccess.glClearNamedBufferSubData(buffer, param.getInternalFormat(), offset, size, param.getFormat(), param.getType(), param.getData());
         }
-
-        @Override
-        public void blazerod$copyBuffer(int target, int source, int targetOffset, int sourceOffset, int size) {
-            ARBDirectStateAccess.glCopyNamedBufferSubData(source, target, sourceOffset, targetOffset, size);
-        }
     }
 
     @Mixin(BufferManager.DefaultBufferManager.class)
@@ -74,14 +69,5 @@ private abstract static class DefaultBufferManagerMixin implements BufferManager
             ARBClearBufferObject.glClearBufferSubData(GlConst.GL_COPY_WRITE_BUFFER, param.getInternalFormat(), offset, size, param.getFormat(), param.getType(), param.getData());
             GlStateManager._glBindBuffer(GlConst.GL_COPY_WRITE_BUFFER, 0);
         }
-
-        @Override
-        public void blazerod$copyBuffer(int target, int source, int targetOffset, int sourceOffset, int size) {
-            GlStateManager._glBindBuffer(GlConst.GL_COPY_READ_BUFFER, source);
-            GlStateManager._glBindBuffer(GlConst.GL_COPY_WRITE_BUFFER, target);
-            GlStateManagerHelper._glCopyBufferSubData(GlConst.GL_COPY_READ_BUFFER, GlConst.GL_COPY_WRITE_BUFFER, sourceOffset, targetOffset, size);
-            GlStateManager._glBindBuffer(GlConst.GL_COPY_READ_BUFFER, 0);
-            GlStateManager._glBindBuffer(GlConst.GL_COPY_WRITE_BUFFER, 0);
-        }
     }
 }

blazerod/render/src/main/java/top/fifthlight/blazerod/mixin/gl/GlCommandEncoderMixin.java

@@ -162,21 +162,4 @@ private boolean onVertexBufferSetWhenDrawingMultipleObjects(RenderPassImpl pass,
             writeToBuffer(slice, byteBuffer);
         }
     }
-
-    @Override
-    public void blazerod$copyBuffer(GpuBufferSlice target, GpuBufferSlice source) {
-        if (target.length() != source.length()) {
-            throw new IllegalArgumentException("Copy source length and target length mismatch: source is " + source.length() + ", but target is " + target.length());
-        }
-        var targetBuffer = (GlGpuBuffer) target.buffer();
-        var sourceBuffer = (GlGpuBuffer) source.buffer();
-        if ((sourceBuffer.usage() & GpuBuffer.USAGE_COPY_SRC) == 0) {
-            throw new IllegalArgumentException("Buffer to be copied from should have USAGE_COPY_SRC bit set");
-        }
-        if ((targetBuffer.usage() & GpuBuffer.USAGE_COPY_DST) == 0) {
-            throw new IllegalArgumentException("Buffer to be copied to should have USAGE_COPY_DST bit set");
-        }
-        var bufferManager = (BufferManagerExtInternal) this.backend.getBufferManager();
-        bufferManager.blazerod$copyBuffer(targetBuffer.id, sourceBuffer.id, target.offset(), source.offset(), target.length());
-    }
 }

blazerod/render/src/main/kotlin/top/fifthlight/blazerod/extension/CommandEncoderExt.kt

@@ -6,6 +6,3 @@ import top.fifthlight.blazerod.extension.CommandEncoderExt
 
 fun CommandEncoder.clearBuffer(slice: GpuBufferSlice, clearType: CommandEncoderExt.ClearType) =
     (this as CommandEncoderExt).`blazerod$clearBuffer`(slice, clearType)
-
-fun CommandEncoder.copyBuffer(target: GpuBufferSlice, source: GpuBufferSlice) =
-    (this as CommandEncoderExt).`blazerod$copyBuffer`(target, source)

blazerod/render/src/main/kotlin/top/fifthlight/blazerod/util/SlottedGpuBuffer.kt

@@ -5,7 +5,6 @@ import com.mojang.blaze3d.systems.RenderSystem
 import it.unimi.dsi.fastutil.ints.IntHeapPriorityQueue
 import net.minecraft.client.gl.RenderPassImpl
 import net.minecraft.util.Identifier
-import top.fifthlight.blazerod.extension.copyBuffer
 import java.lang.AutoCloseable
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
@@ -47,7 +46,7 @@ class SlottedGpuBuffer(
         val device = RenderSystem.getDevice()
         val newBuffer = device.createBuffer(label?.let { { it } }, usage, newSize)
         val commandEncoder = device.createCommandEncoder()
-        commandEncoder.copyBuffer(newBuffer.slice(0, gpuBuffer.size), gpuBuffer.slice())
+        commandEncoder.copyToBuffer(gpuBuffer.slice(), newBuffer.slice(0, gpuBuffer.size))
         gpuBuffer.close()
         gpuBuffer = newBuffer
     }