diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gl/device/DrawCommandList.java b/src/main/java/me/jellysquid/mods/sodium/client/gl/device/DrawCommandList.java index cc6b2e7bc..3e9994183 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gl/device/DrawCommandList.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gl/device/DrawCommandList.java @@ -1,10 +1,12 @@ package me.jellysquid.mods.sodium.client.gl.device; +import java.nio.ByteBuffer; import java.nio.IntBuffer; public interface DrawCommandList extends AutoCloseable { void multiDrawArrays(IntBuffer first, IntBuffer count); + void multiDrawArraysIndirect(ByteBuffer pointer, int count, int stride); void multiDrawArraysIndirect(long pointer, int count, int stride); void endTessellating(); diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gl/device/GLRenderDevice.java b/src/main/java/me/jellysquid/mods/sodium/client/gl/device/GLRenderDevice.java index 4da3b6a2e..a741022fe 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gl/device/GLRenderDevice.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gl/device/GLRenderDevice.java @@ -197,6 +197,12 @@ public class GLRenderDevice implements RenderDevice { GL14.glMultiDrawArrays(primitiveType.getId(), first, count); } + @Override + public void multiDrawArraysIndirect(ByteBuffer pointer, int count, int stride) { + final GlPrimitiveType primitiveType = GLRenderDevice.this.activeTessellation.getPrimitiveType(); + GlFunctions.INDIRECT_DRAW.glMultiDrawArraysIndirect(primitiveType.getId(), pointer, count, stride); + } + @Override public void multiDrawArraysIndirect(long pointer, int count, int stride) { final GlPrimitiveType primitiveType = GLRenderDevice.this.activeTessellation.getPrimitiveType(); diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gl/func/GlIndirectMultiDrawFunctions.java b/src/main/java/me/jellysquid/mods/sodium/client/gl/func/GlIndirectMultiDrawFunctions.java index d706c3d15..dc101050f 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gl/func/GlIndirectMultiDrawFunctions.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gl/func/GlIndirectMultiDrawFunctions.java @@ -1,23 +1,40 @@ package me.jellysquid.mods.sodium.client.gl.func; +import java.nio.ByteBuffer; + import org.lwjgl.opengl.ARBMultiDrawIndirect; import org.lwjgl.opengl.ContextCapabilities; import org.lwjgl.opengl.GL43; public enum GlIndirectMultiDrawFunctions { CORE { + @Override + public void glMultiDrawArraysIndirect(int mode, ByteBuffer indirect, int primcount, int stride) { + GL43.glMultiDrawArraysIndirect(mode, indirect, primcount, stride); + } + @Override public void glMultiDrawArraysIndirect(int mode, long indirect, int primcount, int stride) { GL43.glMultiDrawArraysIndirect(mode, indirect, primcount, stride); } }, ARB { + @Override + public void glMultiDrawArraysIndirect(int mode, ByteBuffer indirect, int primcount, int stride) { + ARBMultiDrawIndirect.glMultiDrawArraysIndirect(mode, indirect, primcount, stride); + } + @Override public void glMultiDrawArraysIndirect(int mode, long indirect, int primcount, int stride) { ARBMultiDrawIndirect.glMultiDrawArraysIndirect(mode, indirect, primcount, stride); } }, UNSUPPORTED { + @Override + public void glMultiDrawArraysIndirect(int mode, ByteBuffer indirect, int primcount, int stride) { + throw new UnsupportedOperationException(); + } + @Override public void glMultiDrawArraysIndirect(int mode, long indirect, int primcount, int stride) { throw new UnsupportedOperationException(); @@ -34,5 +51,7 @@ public enum GlIndirectMultiDrawFunctions { } } + public abstract void glMultiDrawArraysIndirect(int mode, ByteBuffer indirect, int primcount, int stride); public abstract void glMultiDrawArraysIndirect(int mode, long indirect, int primcount, int stride); + } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/backends/multidraw/MultidrawChunkRenderBackend.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/backends/multidraw/MultidrawChunkRenderBackend.java index 98d800674..4e33cb3fc 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/backends/multidraw/MultidrawChunkRenderBackend.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/backends/multidraw/MultidrawChunkRenderBackend.java @@ -42,6 +42,7 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Util; import org.lwjgl.opengl.GL11; +import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; @@ -238,19 +239,31 @@ public class MultidrawChunkRenderBackend extends ChunkRenderShaderBackend region : this.pendingBatches) { final ChunkDrawCallBatcher batch = region.getDrawBatcher(); if (!batch.isEmpty()) { try (DrawCommandList drawCommandList = commandList.beginTessellating(region.getTessellation())) { - drawCommandList.multiDrawArraysIndirect(pointer, batch.getCount(), 0 /* tightly packed */); + if(pointerBuffer == null) { + drawCommandList.multiDrawArraysIndirect(pointer, batch.getCount(), 0 /* tightly packed */); + } else { + drawCommandList.multiDrawArraysIndirect(pointerBuffer, batch.getCount(), 0 /* tightly packed */); + } } } - pointer += batch.getArrayLength(); + if(pointerBuffer == null) { + pointer += batch.getArrayLength(); + } else { + pointerBuffer.position(pointerBuffer.position() + batch.getArrayLength()); + } } + + pointerBuffer.position(originalPointerBufferPos); this.pendingBatches.clear(); }