- * If Persistent buffers are supported, this will provide one. Otherwise it will fall back to a classic mapped - * buffer. - *
- * - * @param type The type of buffer you want. - * @return A buffer that will be persistent if the driver supports it. - */ - public static GlBuffer requestPersistent(GlBufferType type) { - if (GlCompat.getInstance() - .bufferStorageSupported()) { - return new PersistentGlBuffer(type); - } else { - return new MappedGlBuffer(type); - } - } - protected final GlBufferType type; /** diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/PersistentGlBuffer.java b/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/PersistentGlBuffer.java deleted file mode 100644 index ff81679c2..000000000 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/buffer/PersistentGlBuffer.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.jozufozu.flywheel.backend.gl.buffer; - -import static org.lwjgl.opengl.GL30.GL_MAP_WRITE_BIT; -import static org.lwjgl.opengl.GL44.GL_MAP_COHERENT_BIT; -import static org.lwjgl.opengl.GL44.GL_MAP_PERSISTENT_BIT; - -import java.nio.ByteBuffer; - -import org.lwjgl.opengl.GL30; - -import com.jozufozu.flywheel.backend.gl.GlFence; -import com.jozufozu.flywheel.backend.gl.error.GlError; -import com.jozufozu.flywheel.backend.gl.error.GlException; -import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; - -public class PersistentGlBuffer extends GlBuffer implements Mappable { - - private MappedBuffer buffer; - int flags; - - long size; - GlFence fence; - - public PersistentGlBuffer(GlBufferType type) { - super(type); - - flags = GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - fence = new GlFence(); - } - - @Override - public void doneForThisFrame() { - fence.post(); - } - - @Override - protected void alloc(long size) { - this.size = size; - - if (buffer != null) { - deleteInternal(handle()); - _create(); - - bind(); - } - - fence.clear(); - - GlCompat.getInstance().bufferStorage.bufferStorage(type, size, flags); - - ByteBuffer byteBuffer = GL30.glMapBufferRange(type.glEnum, 0, size, flags); - - if (byteBuffer == null) { - throw new GlException(GlError.poll(), "Could not map buffer"); - } - - buffer = new MappedBuffer(this, byteBuffer, 0, size); - } - - @Override - public void upload(ByteBuffer directBuffer) { - throw new UnsupportedOperationException("FIXME: Nothing calls #upload on a persistent buffer as of 12/10/2021."); - } - - @Override - public MappedBuffer getBuffer(long offset, long length) { - - fence.waitSync(); - - buffer.position((int) offset); - - return buffer; - } - - @Override - public GlBufferType getType() { - return type; - } - - @Override - public boolean isPersistent() { - return true; - } -} diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/BufferStorage.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/BufferStorage.java deleted file mode 100644 index a1d787037..000000000 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/BufferStorage.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.jozufozu.flywheel.backend.gl.versioned; - -import org.lwjgl.opengl.ARBBufferStorage; -import org.lwjgl.opengl.GL44; -import org.lwjgl.opengl.GLCapabilities; - -import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; - -public enum BufferStorage implements GlVersioned { - - GL44CORE { - @Override - public boolean supported(GLCapabilities caps) { - return caps.OpenGL44; - } - - @Override - public void bufferStorage(GlBufferType target, long size, int flags) { - GL44.glBufferStorage(target.glEnum, size, flags); - } - }, - ARB { - @Override - public boolean supported(GLCapabilities caps) { - return caps.GL_ARB_buffer_storage; - } - - @Override - public void bufferStorage(GlBufferType target, long size, int flags) { - ARBBufferStorage.glBufferStorage(target.glEnum, size, flags); - } - }, - UNSUPPORTED { - @Override - public boolean supported(GLCapabilities caps) { - return true; - } - - @Override - public void bufferStorage(GlBufferType target, long size, int flags) { - throw new UnsupportedOperationException(); - } - }; - - public abstract void bufferStorage(GlBufferType target, long size, int flags); -} diff --git a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java index 0aaffe754..9eab2552c 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java +++ b/src/main/java/com/jozufozu/flywheel/backend/gl/versioned/GlCompat.java @@ -30,13 +30,11 @@ public class GlCompat { } public final InstancedArrays instancedArrays; - public final BufferStorage bufferStorage; public final boolean amd; private GlCompat() { GLCapabilities caps = GL.createCapabilities(); instancedArrays = getLatest(InstancedArrays.class, caps); - bufferStorage = getLatest(BufferStorage.class, caps); if (Util.getPlatform() == Util.OS.WINDOWS) { String vendor = GL20C.glGetString(GL20C.GL_VENDOR); @@ -55,10 +53,6 @@ public class GlCompat { return instancedArrays != InstancedArrays.UNSUPPORTED; } - public boolean bufferStorageSupported() { - return bufferStorage != BufferStorage.UNSUPPORTED; - } - /** * Get the most compatible version of a specific OpenGL feature by iterating over enum constants in order. * diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java index 448e319d4..03ce112f4 100644 --- a/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java +++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/GPUInstancer.java @@ -10,6 +10,7 @@ import com.jozufozu.flywheel.backend.gl.GlVertexArray; import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer; import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType; import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer; +import com.jozufozu.flywheel.backend.gl.buffer.MappedGlBuffer; import com.jozufozu.flywheel.backend.gl.versioned.GlCompat; import com.jozufozu.flywheel.backend.instancing.AbstractInstancer; import com.jozufozu.flywheel.backend.model.BufferedModel; @@ -80,7 +81,7 @@ public class GPUInstancer