Fix bad cast from an Allocation to a VmaAllocationInfo (#56)

LWJGL · Jul 27, 2024 · 6fce369 · 6fce369
1 parent 86232f9
commit 6fce369
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 35 deletions.
diff --git a/src/org/lwjgl/demo/vulkan/VKUtil.java b/src/org/lwjgl/demo/vulkan/VKUtil.java
@@ -22,6 +22,7 @@
 import org.lwjgl.PointerBuffer;
 import org.lwjgl.system.*;
 import org.lwjgl.util.shaderc.*;
+import org.lwjgl.util.vma.VmaAllocationInfo;
 import org.lwjgl.vulkan.*;
 
 /**
@@ -231,4 +232,9 @@ public static PointerBuffer pointersOfElements(MemoryStack stack, CustomBuffer<?
         }
         return pointerBuffer;
     }
+
+    public static void validateAlignment(VmaAllocationInfo pAllocationInfo, long alignment) {
+        if ((pAllocationInfo.offset() % alignment) != 0)
+            throw new AssertionError("Illegal offset alignment");
+    }
 }
diff --git a/src/org/lwjgl/demo/vulkan/raytracing/HybridMagicaVoxel.java b/src/org/lwjgl/demo/vulkan/raytracing/HybridMagicaVoxel.java
@@ -1087,6 +1087,8 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
             // create the final destination buffer
             LongBuffer pBuffer = stack.mallocLong(1);
             PointerBuffer pAllocation = stack.mallocPointer(1);
+            VmaAllocationInfo pAllocationInfo = VmaAllocationInfo.malloc(stack);
+
             _CHECK_(vmaCreateBuffer(vmaAllocator,
                     VkBufferCreateInfo
                         .calloc(stack)
@@ -1095,13 +1097,10 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
                         .usage(usageFlags | (data != null ? VK_BUFFER_USAGE_TRANSFER_DST_BIT : 0)),
                     VmaAllocationCreateInfo
                         .calloc(stack)
-                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, null),
+                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, pAllocationInfo),
                     "Failed to allocate buffer");
 
-            // validate alignment
-            VmaAllocationInfo ai = VmaAllocationInfo.create(pAllocation.get(0));
-            if ((ai.offset() % alignment) != 0)
-                throw new AssertionError("Illegal offset alignment");
+            validateAlignment(pAllocationInfo, alignment);
 
             // if we have data to upload, use a staging buffer
             if (data != null) {

diff --git a/src/org/lwjgl/demo/vulkan/raytracing/ReflectiveMagicaVoxel.java b/src/org/lwjgl/demo/vulkan/raytracing/ReflectiveMagicaVoxel.java
@@ -883,6 +883,7 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
             // create the final destination buffer
             LongBuffer pBuffer = stack.mallocLong(1);
             PointerBuffer pAllocation = stack.mallocPointer(1);
+            VmaAllocationInfo pAllocationInfo = VmaAllocationInfo.malloc(stack);
             _CHECK_(vmaCreateBuffer(vmaAllocator,
                     VkBufferCreateInfo
                         .calloc(stack)
@@ -891,13 +892,10 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
                         .usage(usageFlags | (data != null ? VK_BUFFER_USAGE_TRANSFER_DST_BIT : 0)),
                     VmaAllocationCreateInfo
                         .calloc(stack)
-                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, null),
+                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, pAllocationInfo),
                     "Failed to allocate buffer");
 
-            // validate alignment
-            VmaAllocationInfo ai = VmaAllocationInfo.create(pAllocation.get(0));
-            if ((ai.offset() % alignment) != 0)
-                throw new AssertionError("Illegal offset alignment");
+            validateAlignment(pAllocationInfo, alignment);
 
             // if we have data to upload, use a staging buffer
             if (data != null) {

diff --git a/src/org/lwjgl/demo/vulkan/raytracing/SdfBricks.java b/src/org/lwjgl/demo/vulkan/raytracing/SdfBricks.java
@@ -878,6 +878,7 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
             // create the final destination buffer
             LongBuffer pBuffer = stack.mallocLong(1);
             PointerBuffer pAllocation = stack.mallocPointer(1);
+            VmaAllocationInfo pAllocationInfo = VmaAllocationInfo.malloc(stack);
             _CHECK_(vmaCreateBuffer(vmaAllocator,
                     VkBufferCreateInfo
                         .calloc(stack)
@@ -886,13 +887,10 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
                         .usage(usageFlags | (data != null ? VK_BUFFER_USAGE_TRANSFER_DST_BIT : 0)),
                     VmaAllocationCreateInfo
                         .calloc(stack)
-                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, null),
+                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, pAllocationInfo),
                     "Failed to allocate buffer");
 
-            // validate alignment
-            VmaAllocationInfo ai = VmaAllocationInfo.create(pAllocation.get(0));
-            if ((ai.offset() % alignment) != 0)
-                throw new AssertionError("Illegal offset alignment");
+            validateAlignment(pAllocationInfo, alignment);
 
             // if we have data to upload, use a staging buffer
             if (data != null) {

diff --git a/src/org/lwjgl/demo/vulkan/raytracing/SimpleSphere.java b/src/org/lwjgl/demo/vulkan/raytracing/SimpleSphere.java
@@ -839,6 +839,7 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
             // create the final destination buffer
             LongBuffer pBuffer = stack.mallocLong(1);
             PointerBuffer pAllocation = stack.mallocPointer(1);
+            VmaAllocationInfo pAllocationInfo = VmaAllocationInfo.malloc(stack);
             _CHECK_(vmaCreateBuffer(vmaAllocator,
                     VkBufferCreateInfo
                         .calloc(stack)
@@ -847,13 +848,10 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
                         .usage(usageFlags | (data != null ? VK_BUFFER_USAGE_TRANSFER_DST_BIT : 0)),
                     VmaAllocationCreateInfo
                         .calloc(stack)
-                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, null),
+                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, pAllocationInfo),
                     "Failed to allocate buffer");
 
-            // validate alignment
-            VmaAllocationInfo ai = VmaAllocationInfo.create(pAllocation.get(0));
-            if ((ai.offset() % alignment) != 0)
-                throw new AssertionError("Illegal offset alignment");
+            validateAlignment(pAllocationInfo, alignment);
 
             // if we have data to upload, use a staging buffer
             if (data != null) {

diff --git a/src/org/lwjgl/demo/vulkan/raytracing/SimpleTriangle.java b/src/org/lwjgl/demo/vulkan/raytracing/SimpleTriangle.java
@@ -843,6 +843,7 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
             // create the final destination buffer
             LongBuffer pBuffer = stack.mallocLong(1);
             PointerBuffer pAllocation = stack.mallocPointer(1);
+            VmaAllocationInfo pAllocationInfo = VmaAllocationInfo.malloc(stack);
             _CHECK_(vmaCreateBuffer(vmaAllocator,
                     VkBufferCreateInfo
                         .calloc(stack)
@@ -851,13 +852,10 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
                         .usage(usageFlags | (data != null ? VK_BUFFER_USAGE_TRANSFER_DST_BIT : 0)),
                     VmaAllocationCreateInfo
                         .calloc(stack)
-                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, null),
+                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, pAllocationInfo),
                     "Failed to allocate buffer");
 
-            // validate alignment
-            VmaAllocationInfo ai = VmaAllocationInfo.create(pAllocation.get(0));
-            if ((ai.offset() % alignment) != 0)
-                throw new AssertionError("Illegal offset alignment");
+            validateAlignment(pAllocationInfo, alignment);
 
             // if we have data to upload, use a staging buffer
             if (data != null) {

diff --git a/src/org/lwjgl/demo/vulkan/raytracing/SimpleTriangleRayQuery.java b/src/org/lwjgl/demo/vulkan/raytracing/SimpleTriangleRayQuery.java
@@ -836,6 +836,7 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
             // create the final destination buffer
             LongBuffer pBuffer = stack.mallocLong(1);
             PointerBuffer pAllocation = stack.mallocPointer(1);
+            VmaAllocationInfo pAllocationInfo = VmaAllocationInfo.malloc(stack);
             _CHECK_(vmaCreateBuffer(vmaAllocator,
                     VkBufferCreateInfo
                         .calloc(stack)
@@ -844,13 +845,10 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
                         .usage(usageFlags | (data != null ? VK_BUFFER_USAGE_TRANSFER_DST_BIT : 0)),
                     VmaAllocationCreateInfo
                         .calloc(stack)
-                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, null),
+                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, pAllocationInfo),
                     "Failed to allocate buffer");
 
-            // validate alignment
-            VmaAllocationInfo ai = VmaAllocationInfo.create(pAllocation.get(0));
-            if ((ai.offset() % alignment) != 0)
-                throw new AssertionError("Illegal offset alignment");
+            validateAlignment(pAllocationInfo, alignment);
 
             // if we have data to upload, use a staging buffer
             if (data != null) {

diff --git a/src/org/lwjgl/demo/vulkan/raytracing/VoxelChunks.java b/src/org/lwjgl/demo/vulkan/raytracing/VoxelChunks.java
@@ -915,6 +915,7 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
             // create the final destination buffer
             LongBuffer pBuffer = stack.mallocLong(1);
             PointerBuffer pAllocation = stack.mallocPointer(1);
+            VmaAllocationInfo pAllocationInfo = VmaAllocationInfo.malloc(stack);
             _CHECK_(vmaCreateBuffer(vmaAllocator,
                     VkBufferCreateInfo
                         .calloc(stack)
@@ -923,13 +924,10 @@ private static AllocationAndBuffer createBuffer(int usageFlags, long size, ByteB
                         .usage(usageFlags | (data != null ? VK_BUFFER_USAGE_TRANSFER_DST_BIT : 0)),
                     VmaAllocationCreateInfo
                         .calloc(stack)
-                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, null),
+                        .usage(VMA_MEMORY_USAGE_AUTO), pBuffer, pAllocation, pAllocationInfo),
                     "Failed to allocate buffer");
 
-            // validate alignment
-            VmaAllocationInfo ai = VmaAllocationInfo.create(pAllocation.get(0));
-            if ((ai.offset() % alignment) != 0)
-                throw new AssertionError("Illegal offset alignment");
+            validateAlignment(pAllocationInfo, alignment);
 
             // if we have data to upload, use a staging buffer
             if (data != null) {