More updating

README.md

@@ -26,7 +26,7 @@ Fabric mods before, you can find a variety of community guides for doing so [her
 
 ![GitHub release](https://img.shields.io/github/release/CaffeineMC/sodium-fabric.svg)
 
-The latest releases of Sodium are published to our [Modrinth](https://modrinth.com/mods/sodium) and
+The latest releases of Sodium are published to our [Modrinth](https://modrinth.com/mod/sodium) and
 [GitHub release](https://github.com/CaffeineMC/sodium-fabric/releases) pages. Releases are considered by our team to be
 **suitable for general use**, but they are not guaranteed to be free of bugs and other issues.
 
@@ -54,11 +54,6 @@ If you are using the CurseForge client, you can continue to find downloads throu
 [CurseForge page](https://www.curseforge.com/minecraft/mc-mods/sodium). Unless you are using the CurseForge
 client, you should prefer the downloads linked on our Modrinth or GitHub release pages above.
 
-The CurseForge client does not natively support Fabric modding, so you will need to install
-[Jumploader](https://www.curseforge.com/minecraft/mc-mods/jumploader) in order to set up your Fabric environment. Due to
-the extra complexity and startup overhead this workaround adds, we generally do not recommend using this method unless
-you have an existing setup with it.
-
 ---
 
 ### Reporting Issues

gradle.properties

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.16.4
-yarn_mappings=1.16.4+build.1
-loader_version=0.10.6+build.214
+minecraft_version=1.16.5
+yarn_mappings=1.16.5+build.9
+loader_version=0.11.3
 
 # Mod Properties
-mod_version=0.1.1
+mod_version=0.2.0
 maven_group=me.jellysquid.mods
 archives_base_name=sodium-fabric
 

src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java

@@ -3,18 +3,28 @@
 import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
 import me.jellysquid.mods.sodium.client.util.UnsafeUtil;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.File;
+import java.nio.file.Paths;
 
 public class SodiumClientMod implements ClientModInitializer {
     private static SodiumGameOptions CONFIG;
     private static Logger LOGGER;
 
+    private static String MOD_VERSION;
+
     @Override
     public void onInitializeClient() {
+        ModContainer mod = FabricLoader.getInstance()
+                .getModContainer("sodium")
+                .orElseThrow(NullPointerException::new);
 
+        MOD_VERSION = mod.getMetadata()
+                .getVersion()
+                .getFriendlyString();
     }
 
     public static SodiumGameOptions options() {
@@ -34,13 +44,21 @@ public static Logger logger() {
     }
 
     private static SodiumGameOptions loadConfig() {
-        SodiumGameOptions config = SodiumGameOptions.load(new File("config/sodium-options.json"));
+        SodiumGameOptions config = SodiumGameOptions.load(FabricLoader.getInstance().getConfigDir().resolve("sodium-options.json"));
         onConfigChanged(config);
 
         return config;
     }
 
     public static void onConfigChanged(SodiumGameOptions options) {
-        UnsafeUtil.setEnabled(options.advanced.useMemoryIntrinsics);
+        UnsafeUtil.setEnabled(options.advanced.allowDirectMemoryAccess);
+    }
+
+    public static String getVersion() {
+        if (MOD_VERSION == null) {
+            throw new NullPointerException("Mod version hasn't been populated yet");
+        }
+
+        return MOD_VERSION;
     }
 }

src/main/java/me/jellysquid/mods/sodium/client/gl/GlObject.java

@@ -1,5 +1,7 @@
 package me.jellysquid.mods.sodium.client.gl;
 
+import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
+
 /**
  * An abstract object used to represent objects in OpenGL code safely. This class hides the direct handle to a OpenGL
  * object, requiring that it first be checked by all callers to prevent null pointer de-referencing. However, this will
@@ -9,8 +11,13 @@
 public class GlObject {
     private static final int INVALID_HANDLE = Integer.MIN_VALUE;
 
+    protected final RenderDevice device;
     private int handle = INVALID_HANDLE;
 
+    public GlObject(RenderDevice owner) {
+        this.device = owner;
+    }
+
     protected final void setHandle(int handle) {
         this.handle = handle;
     }
@@ -31,7 +38,11 @@ protected final boolean isHandleValid() {
         return this.handle != INVALID_HANDLE;
     }
 
-    protected final void invalidateHandle() {
+    public final void invalidateHandle() {
         this.handle = INVALID_HANDLE;
     }
+
+    public RenderDevice getDevice() {
+        return this.device;
+    }
 }

src/main/java/me/jellysquid/mods/sodium/client/gl/arena/GlBufferArena.java

@@ -2,128 +2,98 @@
 
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
 import me.jellysquid.mods.sodium.client.gl.buffer.GlBuffer;
+import me.jellysquid.mods.sodium.client.gl.buffer.GlBufferTarget;
+import me.jellysquid.mods.sodium.client.gl.buffer.GlBufferUsage;
 import me.jellysquid.mods.sodium.client.gl.buffer.GlMutableBuffer;
-import me.jellysquid.mods.sodium.client.gl.util.MemoryTracker;
-import org.lwjgl.opengl.GL15;
-import org.lwjgl.opengl.GL31;
-import org.lwjgl.opengl.GL33;
+import me.jellysquid.mods.sodium.client.gl.device.CommandList;
+import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
 
 import java.util.Set;
 
 public class GlBufferArena {
+    private static final GlBufferUsage BUFFER_USAGE = GlBufferUsage.GL_DYNAMIC_DRAW;
+
+    private final RenderDevice device;
     private final int resizeIncrement;
 
-    private final MemoryTracker memoryTracker;
-    private final Set<GlBufferRegion> freeRegions = new ObjectLinkedOpenHashSet<>();
+    private final Set<GlBufferSegment> freeRegions = new ObjectLinkedOpenHashSet<>();
 
-    private GlBuffer vertexBuffer;
-    private boolean isBufferBound;
+    private GlMutableBuffer vertexBuffer;
 
     private int position;
     private int capacity;
     private int allocCount;
-    private int usedBytes;
-
-    public GlBufferArena(MemoryTracker memoryTracker, int initialSize, int resizeIncrement) {
-        this.memoryTracker = memoryTracker;
 
-        this.vertexBuffer = this.createBuffer();
-        this.vertexBuffer.bind(GL31.GL_COPY_WRITE_BUFFER);
-        this.vertexBuffer.allocate(GL31.GL_COPY_WRITE_BUFFER, initialSize);
-        this.vertexBuffer.unbind(GL31.GL_COPY_WRITE_BUFFER);
+    public GlBufferArena(RenderDevice device, int initialSize, int resizeIncrement) {
+        this.device = device;
 
-        this.memoryTracker.onMemoryAllocate(this.vertexBuffer.getSize());
+        try (CommandList commands = device.createCommandList()) {
+            this.vertexBuffer = commands.createMutableBuffer(BUFFER_USAGE);
+            commands.allocateBuffer(GlBufferTarget.COPY_WRITE_BUFFER, this.vertexBuffer, initialSize);
+        }
 
         this.resizeIncrement = resizeIncrement;
         this.capacity = initialSize;
     }
 
-    private void resize(int size) {
-        this.memoryTracker.onMemoryRelease(this.vertexBuffer.getSize());
-
-        GlBuffer src = this.vertexBuffer;
-        src.unbind(GL31.GL_COPY_WRITE_BUFFER);
-
-        GlBuffer dst = this.createBuffer();
-
-        GlBuffer.copy(src, dst, 0, 0, this.capacity, size);
-        src.delete();
+    private void resize(CommandList commandList, int newCapacity) {
+        GlMutableBuffer src = this.vertexBuffer;
+        GlMutableBuffer dst = commandList.createMutableBuffer(BUFFER_USAGE);
 
-        dst.bind(GL31.GL_COPY_WRITE_BUFFER);
+        commandList.allocateBuffer(GlBufferTarget.COPY_WRITE_BUFFER, dst, newCapacity);
+        commandList.copyBufferSubData(src, dst, 0, 0, this.position);
+        commandList.deleteBuffer(src);
 
         this.vertexBuffer = dst;
-        this.capacity = size;
-
-        this.memoryTracker.onMemoryAllocate(this.vertexBuffer.getSize());
-    }
-
-    private GlBuffer createBuffer() {
-        return new GlMutableBuffer(GL15.GL_DYNAMIC_DRAW);
-    }
-
-    public void bind() {
-        this.vertexBuffer.bind(GL31.GL_COPY_WRITE_BUFFER);
-        this.isBufferBound = true;
+        this.capacity = newCapacity;
     }
 
-    public void ensureCapacity(int len) {
-        if (this.position + len >= this.capacity) {
-            this.resize(this.getNextSize(len));
+    public void prepareBuffer(CommandList commandList, int bytes) {
+        if (this.position + bytes >= this.capacity) {
+            this.resize(commandList, this.getNextSize(bytes));
         }
     }
 
-    public GlBufferRegion upload(int readTarget, int offset, int len) {
-        this.checkBufferBound();
-        this.ensureCapacity(len);
+    public GlBufferSegment uploadBuffer(CommandList commandList, GlBuffer readBuffer, int readOffset, int byteCount) {
+        this.prepareBuffer(commandList, byteCount);
 
-        GlBufferRegion segment = this.alloc(len);
-        GL33.glCopyBufferSubData(readTarget, GL31.GL_COPY_WRITE_BUFFER, offset, segment.getStart(), len);
+        GlBufferSegment segment = this.alloc(byteCount);
 
-        return segment;
-    }
-
-    public void unbind() {
-        this.checkBufferBound();
+        commandList.copyBufferSubData(readBuffer, this.vertexBuffer, readOffset, segment.getStart(), byteCount);
 
-        this.vertexBuffer.unbind(GL31.GL_COPY_WRITE_BUFFER);
-        this.isBufferBound = false;
+        return segment;
     }
 
     private int getNextSize(int len) {
         return Math.max(this.capacity + this.resizeIncrement, this.capacity + len);
     }
 
-    public void free(GlBufferRegion segment) {
+    public void free(GlBufferSegment segment) {
         if (!this.freeRegions.add(segment)) {
             throw new IllegalArgumentException("Segment already freed");
         }
 
-        this.memoryTracker.onMemoryFree(segment.getLength());
         this.allocCount--;
-        this.usedBytes -= segment.getLength();
     }
 
-    private GlBufferRegion alloc(int len) {
-        GlBufferRegion segment = this.allocReuse(len);
+    private GlBufferSegment alloc(int len) {
+        GlBufferSegment segment = this.allocReuse(len);
 
         if (segment == null) {
-            segment = new GlBufferRegion(this, this.position, len);
+            segment = new GlBufferSegment(this, this.position, len);
 
             this.position += len;
         }
 
         this.allocCount++;
-        this.usedBytes += segment.getLength();
-
-        this.memoryTracker.onMemoryUse(segment.getLength());
 
         return segment;
     }
 
-    private GlBufferRegion allocReuse(int len) {
-        GlBufferRegion bestSegment = null;
+    private GlBufferSegment allocReuse(int len) {
+        GlBufferSegment bestSegment = null;
 
-        for (GlBufferRegion segment : this.freeRegions) {
+        for (GlBufferSegment segment : this.freeRegions) {
             if (segment.getLength() < len) {
                 continue;
             }
@@ -142,17 +112,16 @@ private GlBufferRegion allocReuse(int len) {
         int excess = bestSegment.getLength() - len;
 
         if (excess > 0) {
-            this.freeRegions.add(new GlBufferRegion(this, bestSegment.getStart() + len, excess));
+            this.freeRegions.add(new GlBufferSegment(this, bestSegment.getStart() + len, excess));
         }
 
-        return new GlBufferRegion(this, bestSegment.getStart(), len);
+        return new GlBufferSegment(this, bestSegment.getStart(), len);
     }
 
     public void delete() {
-        this.memoryTracker.onMemoryFree(this.usedBytes);
-        this.memoryTracker.onMemoryRelease(this.vertexBuffer.getSize());
-
-        this.vertexBuffer.delete();
+        try (CommandList commands = this.device.createCommandList()) {
+            commands.deleteBuffer(this.vertexBuffer);
+        }
     }
 
     public boolean isEmpty() {
@@ -162,10 +131,4 @@ public boolean isEmpty() {
     public GlBuffer getBuffer() {
         return this.vertexBuffer;
     }
-
-    private void checkBufferBound() {
-        if (!this.isBufferBound) {
-            throw new IllegalStateException("Buffer is not bound");
-        }
-    }
 }

src/main/java/me/jellysquid/mods/sodium/client/gl/arena/GlBufferRegion.java → src/main/java/me/jellysquid/mods/sodium/client/gl/arena/GlBufferSegment.java

@@ -1,11 +1,11 @@
 package me.jellysquid.mods.sodium.client.gl.arena;
 
-public class GlBufferRegion {
+public class GlBufferSegment {
     private final GlBufferArena arena;
     private final int start;
     private final int len;
 
-    GlBufferRegion(GlBufferArena arena, int start, int len) {
+    GlBufferSegment(GlBufferArena arena, int start, int len) {
         this.arena = arena;
         this.start = start;
         this.len = len;

src/main/java/me/jellysquid/mods/sodium/client/gl/array/GlVertexArray.java

@@ -2,31 +2,21 @@
 
 import me.jellysquid.mods.sodium.client.gl.GlObject;
 import me.jellysquid.mods.sodium.client.gl.func.GlFunctions;
+import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
 
 /**
  * Provides Vertex Array functionality on supported platforms.
  */
 public class GlVertexArray extends GlObject {
-    public GlVertexArray() {
+    public static final int NULL_ARRAY_ID = 0;
+
+    public GlVertexArray(RenderDevice owner) {
+        super(owner);
+
         if (!GlFunctions.isVertexArraySupported()) {
             throw new UnsupportedOperationException("Vertex arrays are unsupported on this platform");
         }
 
         this.setHandle(GlFunctions.VERTEX_ARRAY.glGenVertexArrays());
     }
-
-    public void unbind() {
-        GlFunctions.VERTEX_ARRAY.glBindVertexArray(0);
-    }
-
-    public void bind() {
-        GlFunctions.VERTEX_ARRAY.glBindVertexArray(this.handle());
-    }
-
-    public void delete() {
-        GlFunctions.VERTEX_ARRAY.glDeleteVertexArrays(this.handle());
-
-        this.invalidateHandle();
-    }
-
 }