Skip to content

Commit

Permalink
Use KMT handles on Windows & Make TLAS / section geometry management …
Browse files Browse the repository at this point in the history 
…safer
  • Loading branch information
@bobcao3
bobcao3 committed Sep 23, 2023
1 parent fca1c34 commit 23815f5
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 23 deletions.
35 changes: 22 additions & 13 deletions src/main/java/me/cortex/vulkanite/acceleration/AccelerationTLASManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.lwjgl.vulkan.*;

import java.util.*;
import java.util.concurrent.LinkedBlockingDeque;

import static org.lwjgl.system.MemoryStack.stackPush;
import static org.lwjgl.util.vma.Vma.VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT;
Expand Down Expand Up @@ -335,7 +334,11 @@ private final class TLASSectionManager extends TLASGeometryManager {
private int setCapacity = 0;

private record DescUpdateJob(int binding, int dstArrayElement, List<VBuffer> buffers) {}
private final LinkedBlockingDeque<DescUpdateJob> descUpdateJobs = new LinkedBlockingDeque<>();
private record ArenaDeallocJob(int index, int count, List<VBuffer> geometryBuffers) {}

private final Deque<DescUpdateJob> descUpdateJobs = new ArrayDeque<>();
private final Deque<ArenaDeallocJob> arenaDeallocJobs = new ArrayDeque<>();
private final Deque<VDescriptorPool> descPoolsToRelease = new ArrayDeque<>();

public void resizeBindlessSet(int newSize, VFence fence) {
if (geometryBufferSetLayout == null) {
Expand Down Expand Up @@ -364,13 +367,7 @@ public void resizeBindlessSet(int newSize, VFence fence) {
vkUpdateDescriptorSets(context.device, null, setCopy);
}

// This breaks the shit out of it
// context.sync.addCallback(fence, () -> {
// geometryBufferDescPool.free();
// });

vkDeviceWaitIdle(context.device);
geometryBufferDescPool.free();
descPoolsToRelease.add(geometryBufferDescPool);
}

geometryBufferDescPool = newGeometryBufferDescPool;
Expand All @@ -396,6 +393,9 @@ public void setGeometryUpdateMemory(VCmdBuff cmd, VFence fence, VkAccelerationSt
dub.buffer(job.binding, job.dstArrayElement, job.buffers);
}
dub.apply();

// Queue up the arena dealloc jobs to be done after the fence is done
Vulkanite.INSTANCE.addSyncedCallback(() -> { fenceTick(); });
}

//TODO: mixinto RenderSection and add a reference to a holder for us, its much faster than a hashmap
Expand All @@ -415,6 +415,17 @@ private Holder(int id, RenderSection section) {

Map<ChunkSectionPos, Holder> tmp = new HashMap<>();

public void fenceTick() {
while (!arenaDeallocJobs.isEmpty()) {
var job = arenaDeallocJobs.poll();
arena.free(job.index, job.count);
job.geometryBuffers.forEach(buffer -> buffer.free());
}
while (!descPoolsToRelease.isEmpty()) {
descPoolsToRelease.poll().free();
}
}

public void update(AccelerationBlasBuilder.BLASBuildResult result) {
var data = result.data();
var holder = tmp.computeIfAbsent(data.section().getPosition(), a -> new Holder(alloc(), data.section()));
Expand All @@ -424,8 +435,7 @@ public void update(AccelerationBlasBuilder.BLASBuildResult result) {
holder.structure = result.structure();

if (holder.geometryIndex != -1) {
arena.free(holder.geometryIndex, holder.geometryBuffers.size());
holder.geometryBuffers.forEach(buffer -> Vulkanite.INSTANCE.addSyncedCallback(buffer::free));
arenaDeallocJobs.add(new ArenaDeallocJob(holder.geometryIndex, holder.geometryBuffers.size(), holder.geometryBuffers));
}
holder.geometryBuffers = data.geometryBuffers();
holder.geometryIndex = arena.allocate(holder.geometryBuffers.size());
Expand Down Expand Up @@ -461,9 +471,8 @@ public void remove(RenderSection section) {
}

if (holder.geometryIndex != -1) {
arena.free(holder.geometryIndex, holder.geometryBuffers.size());
arenaDeallocJobs.add(new ArenaDeallocJob(holder.geometryIndex, holder.geometryBuffers.size(), holder.geometryBuffers));
}
holder.geometryBuffers.forEach(buffer -> Vulkanite.INSTANCE.addSyncedCallback(buffer::free));
}
}

Expand Down
21 changes: 11 additions & 10 deletions src/main/java/me/cortex/vulkanite/lib/memory/MemoryManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.lwjgl.opengl.EXTMemoryObjectFD.GL_HANDLE_TYPE_OPAQUE_FD_EXT;
import static org.lwjgl.opengl.EXTMemoryObjectFD.glImportMemoryFdEXT;
import static org.lwjgl.opengl.EXTMemoryObjectWin32.glImportMemoryWin32HandleEXT;
import static org.lwjgl.opengl.EXTMemoryObjectWin32.GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT;
import static org.lwjgl.opengl.EXTSemaphoreWin32.GL_HANDLE_TYPE_OPAQUE_WIN32_EXT;
import static org.lwjgl.opengl.GL11C.*;
import static org.lwjgl.opengl.GL12.GL_TEXTURE_3D;
Expand All @@ -35,10 +36,10 @@
import static org.lwjgl.vulkan.VK10.*;
import static org.lwjgl.vulkan.VK11.VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
import static org.lwjgl.vulkan.VK11.VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT;
import static org.lwjgl.vulkan.VK12.VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT;
import static org.lwjgl.vulkan.VK11.VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT;

public class MemoryManager {
private static final int EXTERNAL_MEMORY_HANDLE_TYPE = Vulkanite.IS_WINDOWS?VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT:VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
private static final int EXTERNAL_MEMORY_HANDLE_TYPE = Vulkanite.IS_WINDOWS?VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT:VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
private final VkDevice device;
private final VmaAllocator allocator;
private final boolean hasDeviceAddresses;
Expand Down Expand Up @@ -72,7 +73,7 @@ public static int acquire(VmaAllocator.Allocation allocation, VkDevice device) {
_CHECK_(vkGetMemoryWin32HandleKHR(device, VkMemoryGetWin32HandleInfoKHR.calloc(stack)
.sType$Default()
.memory(vkMemory)
.handleType(VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT), pb));
.handleType(VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT), pb));
nativeHandle = pb.get(0);
} else {
IntBuffer pb = stack.callocInt(1);
Expand All @@ -93,7 +94,7 @@ public static int acquire(VmaAllocator.Allocation allocation, VkDevice device) {
if (Vulkanite.IS_WINDOWS) {
glImportMemoryWin32HandleEXT(newMemoryObject,
memorySize,
GL_HANDLE_TYPE_OPAQUE_WIN32_EXT, nativeHandle);
GL_HANDLE_TYPE_OPAQUE_WIN32_KMT_EXT, nativeHandle);
_CHECK_GL_ERROR_();
} else {
glImportMemoryFdEXT(newMemoryObject, memorySize,
Expand Down Expand Up @@ -131,16 +132,16 @@ public static void release(long memory) {
glDeleteMemoryObjectsEXT(tracked.desc.glMemoryObj);
_CHECK_GL_ERROR_();
if (Vulkanite.IS_WINDOWS) {
if (!Kernel32.INSTANCE.CloseHandle(new WinNT.HANDLE(new Pointer(tracked.desc.handle)))) {
int error = Kernel32.INSTANCE.GetLastError();
System.err.println("STATE MIGHT BE BROKEN! Failed to close handle: " + error);
// throw new IllegalStateException();
}
// if (!Kernel32.INSTANCE.CloseHandle(new WinNT.HANDLE(new Pointer(tracked.desc.handle)))) {
// int error = Kernel32.INSTANCE.GetLastError();
// System.err.println("STATE MIGHT BE BROKEN! Failed to close handle: " + error);
// throw new IllegalStateException();
// }
} else {
int code = 0;
if ((code = LibC.INSTANCE.close((int) tracked.desc.handle)) != 0) {
System.err.println("STATE MIGHT BE BROKEN! Failed to close FD: " + code);
// throw new IllegalStateException();
throw new IllegalStateException();
}
}
MEMORY_TO_HANDLES.remove(memory);
Expand Down

0 comments on commit 23815f5

Please sign in to comment.