Use ByteBuffer overload when indirect buffer is in client memory

Fixes #373
This commit is contained in:
makamys authored and Jason Mitchell committed 2024-03-15 15:23:37 -07:00
1 parent 636b616f64
commit 22d28abce6
4 files changed
+43 -3

No files matched your search

@@ -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();
@@ -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();
@@ -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);
}
@@ -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<Multid
commandList.uploadData(this.commandBuffer, this.commandClientBufferBuilder.getBuffer());
}
long pointer = this.commandBuffer == null ? this.commandClientBufferBuilder.getBufferAddress() : 0L;
long pointer = 0L;
ByteBuffer pointerBuffer = this.commandBuffer == null ? this.commandClientBufferBuilder.getBuffer() : null;
int originalPointerBufferPos = pointerBuffer.position();
for (ChunkRegion<?> 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();
}