Merge pull request #3 from FalsePattern/master

polymorphic Vma buffers
knokko · Mar 16, 2024 · 1764614 · 1764614
2 parents 886811a + 95232ec
commit 1764614
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/samples/src/main/java/com/github/knokko/boiler/samples/HelloXR.java b/samples/src/main/java/com/github/knokko/boiler/samples/HelloXR.java
@@ -218,7 +218,7 @@ public static void main(String[] args) throws InterruptedException {
             matrixWrite.dstArrayElement(0);
             matrixWrite.descriptorCount(1);
             matrixWrite.descriptorType(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-            matrixWrite.pBufferInfo(boiler.descriptors.bufferInfo(stack, matrixBuffer.asBuffer()));
+            matrixWrite.pBufferInfo(boiler.descriptors.bufferInfo(stack, matrixBuffer));
 
             vkUpdateDescriptorSets(boiler.vkDevice(), descriptorWrites, null);
 

diff --git a/samples/src/main/java/com/github/knokko/boiler/samples/TerrainPlayground.java b/samples/src/main/java/com/github/knokko/boiler/samples/TerrainPlayground.java
@@ -440,7 +440,7 @@ public static void main(String[] args) throws InterruptedException {
             uniformWrite.dstArrayElement(0);
             uniformWrite.descriptorCount(1);
             uniformWrite.descriptorType(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
-            uniformWrite.pBufferInfo(boiler.descriptors.bufferInfo(stack, uniformBuffer.asBuffer()));
+            uniformWrite.pBufferInfo(boiler.descriptors.bufferInfo(stack, uniformBuffer));
             var heightMapWrite = descriptorWrites.get(1);
             heightMapWrite.sType$Default();
             heightMapWrite.dstSet(descriptorSet);

diff --git a/src/main/java/com/github/knokko/boiler/buffer/BoilerBuffers.java b/src/main/java/com/github/knokko/boiler/buffer/BoilerBuffers.java
@@ -19,7 +19,7 @@ public BoilerBuffers(BoilerInstance instance) {
         this.instance = instance;
     }
 
-    public VmaBuffer create(long size, int usage, String name) {
+    public DeviceOnlyVmaBuffer create(long size, int usage, String name) {
         try (var stack = stackPush()) {
             var ciBuffer = VkBufferCreateInfo.calloc(stack);
             ciBuffer.sType$Default();
@@ -38,7 +38,7 @@ public VmaBuffer create(long size, int usage, String name) {
                     instance.vmaAllocator(), ciBuffer, ciAllocation, pBuffer, pAllocation, null
             ), "CreateBuffer", name);
             instance.debug.name(stack, pBuffer.get(0), VK_OBJECT_TYPE_BUFFER, name);
-            return new VmaBuffer(pBuffer.get(0), pAllocation.get(0), size);
+            return new DeviceOnlyVmaBuffer(pBuffer.get(0), pAllocation.get(0), size);
         }
     }
 

diff --git a/src/main/java/com/github/knokko/boiler/buffer/DeviceOnlyVmaBuffer.java b/src/main/java/com/github/knokko/boiler/buffer/DeviceOnlyVmaBuffer.java
@@ -0,0 +1,4 @@
+package com.github.knokko.boiler.buffer;
+
+public record DeviceOnlyVmaBuffer(long vkBuffer, long vmaAllocation, long size) implements VmaBuffer {
+}
diff --git a/src/main/java/com/github/knokko/boiler/buffer/MappedVmaBuffer.java b/src/main/java/com/github/knokko/boiler/buffer/MappedVmaBuffer.java
@@ -1,14 +1,8 @@
 package com.github.knokko.boiler.buffer;
 
-import static org.lwjgl.util.vma.Vma.vmaDestroyBuffer;
-
-public record MappedVmaBuffer(long vkBuffer, long vmaAllocation, long size, long hostAddress) {
-
-    public void destroy(long vmaAllocator) {
-        vmaDestroyBuffer(vmaAllocator, vkBuffer, vmaAllocation);
-    }
-
+public record MappedVmaBuffer(long vkBuffer, long vmaAllocation, long size, long hostAddress) implements VmaBuffer {
+    @Deprecated
     public VmaBuffer asBuffer() {
-        return new VmaBuffer(vkBuffer, vmaAllocation, size);
+        return this;
     }
 }
diff --git a/src/main/java/com/github/knokko/boiler/buffer/VmaBuffer.java b/src/main/java/com/github/knokko/boiler/buffer/VmaBuffer.java
@@ -2,9 +2,12 @@
 
 import static org.lwjgl.util.vma.Vma.vmaDestroyBuffer;
 
-public record VmaBuffer(long vkBuffer, long vmaAllocation, long size) {
+public sealed interface VmaBuffer permits DeviceOnlyVmaBuffer, MappedVmaBuffer {
+    long vkBuffer();
+    long vmaAllocation();
+    long size();
 
-    void destroy(long vmaAllocator) {
-        vmaDestroyBuffer(vmaAllocator, vkBuffer, vmaAllocation);
+    default void destroy(long vmaAllocator) {
+        vmaDestroyBuffer(vmaAllocator, vkBuffer(), vmaAllocation());
     }
 }
diff --git a/src/test/java/com/github/knokko/boiler/compute/TestComputePipelines.java b/src/test/java/com/github/knokko/boiler/compute/TestComputePipelines.java
@@ -83,7 +83,7 @@ public void testSimpleComputeShader() {
             descriptorWrites.dstArrayElement(0);
             descriptorWrites.descriptorCount(1);
             descriptorWrites.descriptorType(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER);
-            descriptorWrites.pBufferInfo(boiler.descriptors.bufferInfo(stack, buffer.asBuffer()));
+            descriptorWrites.pBufferInfo(boiler.descriptors.bufferInfo(stack, buffer));
 
             vkUpdateDescriptorSets(boiler.vkDevice(), descriptorWrites, null);