switch to fixed default device heap

TheNumbat · Sep 30, 2024 · e8dc377 · e8dc377
1 parent 393ad1b
commit e8dc377
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/rvk/instance.cpp b/rvk/instance.cpp
@@ -112,7 +112,7 @@ static VkBool32 debug_callback(VkDebugUtilsMessageSeverityFlagBitsEXT sev,
     if(is_error) RPP_DEBUG_BREAK;
 #endif
 
-    return is_error;
+    return false;
 }
 
 Slice<const char*> Instance::baseline_extensions() {

diff --git a/rvk/rvk.cpp b/rvk/rvk.cpp
@@ -199,13 +199,13 @@ Vk::Vk(Config config) {
         if(heap_size < Math::MB(128)) {
             die("[rvk] Device heap is too small: %mb / 128mb.", heap_size / Math::MB(1));
         }
-        if(config.device_heap_margin > heap_size) {
-            warn("[rvk] Requested device heap margin is larger than the heap, using 64mb margin.");
-            config.device_heap_margin = Math::MB(64);
+        if(config.device_heap > heap_size) {
+            warn("[rvk] Requested device margin is larger than available, using entire heap.");
+            config.device_heap = heap_size;
         }
 
         u64 allocated = 0;
-        u64 target = device->heap_size(Heap::device) - config.device_heap_margin;
+        u64 target = config.device_heap;
         while(allocated < target) {
             u64 size = Math::min(target - allocated, physical_device->max_allocation());
             device_memories.push(

diff --git a/rvk/rvk.h b/rvk/rvk.h
@@ -38,7 +38,7 @@ struct Config {
     Function<VkSurfaceKHR(VkInstance)> create_surface;
 
     u64 host_heap = Math::GB(1);
-    u64 device_heap_margin = Math::GB(1);
+    u64 device_heap = Math::MB(4094);
 };
 
 bool startup(Config config);
@@ -118,13 +118,13 @@ void submit(Commands& cmds, u32 index, Slice<const Sem_Ref> wait, Slice<const Se
 
 template<typename F>
     requires Invocable<F, Commands&>
-auto sync(F&& f, Queue_Family family = Queue_Family::graphics, u32 index = 0)
-    -> Invoke_Result<F, Commands&>;
+auto sync(F&& f, Queue_Family family = Queue_Family::graphics,
+          u32 index = 0) -> Invoke_Result<F, Commands&>;
 
 template<typename F>
     requires Invocable<F, Commands&>
-auto async(Async::Pool<>& pool, F&& f, Queue_Family family = Queue_Family::graphics, u32 index = 0)
-    -> Async::Task<Invoke_Result<F, Commands&>>;
+auto async(Async::Pool<>& pool, F&& f, Queue_Family family = Queue_Family::graphics,
+           u32 index = 0) -> Async::Task<Invoke_Result<F, Commands&>>;
 
 } // namespace rvk