Fix Graphite Sample

CMakeLists.txt

@@ -24,6 +24,12 @@ endif()
 target_compile_definitions(graphite PUBLIC PLATFORM_EXT=${PLATFORM_EXT})
 target_compile_definitions(graphite PUBLIC PLATFORM=${PLATFORM})
 
+# Samples directory
+if(GRAPHITE_SAMPLES)
+    add_subdirectory("sample")
+    set(GRAPHITE_IMGUI_DIR "${CMAKE_SOURCE_DIR}/sample/extern/imgui/")
+endif()
+
 # ImGUI support
 if(GRAPHITE_IMGUI_DIR)
     # Sources
@@ -87,10 +93,5 @@ if(GRAPHITE_PLATFORM STREQUAL "Vulkan")
     )
 endif()
 
-# Samples directory
-if(GRAPHITE_SAMPLES)
-    add_subdirectory("samples")
-endif()
-
 # External dependencies
 add_subdirectory("extern")

extern/CMakeLists.txt

@@ -5,5 +5,6 @@ if(GRAPHITE_PLATFORM STREQUAL "Vulkan")
     target_compile_definitions(graphite PUBLIC IMGUI_IMPL_VULKAN_USE_VOLK)
 
     # VMA
+    target_compile_definitions(graphite PRIVATE NOMINMAX)
     target_include_directories(graphite PUBLIC "./vma")
 endif()

extern/volk/CMakeLists.txt

@@ -142,5 +142,4 @@ if(VOLK_INSTALL)
     ${CMAKE_CURRENT_BINARY_DIR}/volkConfigVersion.cmake
     DESTINATION ${INSTALL_CONFIGDIR}
   )
-
 endif()

sample/CMakeLists.txt

@@ -0,0 +1,20 @@
+set(SAMPLE_DIR .)
+set(EXE_NAME sample)
+
+# Executable target
+project(${EXE_NAME})
+add_executable(${EXE_NAME} "${SAMPLE_DIR}/src/main.cc")
+set_target_properties(${EXE_NAME} PROPERTIES OUTPUT_NAME ${EXE_NAME})
+
+# Add compiler definitions
+target_compile_definitions(${EXE_NAME} PRIVATE $<$<CONFIG:Debug>:DEBUG=1>)
+target_compile_definitions(${EXE_NAME} PRIVATE $<$<CONFIG:Release>:NDEBUG=1>)
+
+# Include directories
+target_include_directories(${EXE_NAME} PRIVATE "${SAMPLE_DIR}/src/")
+
+# Link to the Graphite library
+target_link_libraries(${EXE_NAME} PRIVATE graphite)
+
+# External dependencies
+add_subdirectory("extern")

samples/testing/extern/CMakeLists.txt → sample/extern/CMakeLists.txt

@@ -1,9 +1,9 @@
 # GLFW
 add_subdirectory("glfw")
-target_link_libraries(sample-testing PRIVATE glfw)
+target_link_libraries(sample PRIVATE glfw)
 
 # ImGUI
-target_sources(sample-testing
+target_sources(sample
     PRIVATE "./imgui/imgui_demo.cpp"
     PRIVATE "./imgui/imgui_draw.cpp"
     PRIVATE "./imgui/imgui_tables.cpp"
@@ -13,12 +13,12 @@ target_sources(sample-testing
     PRIVATE "./imgui/backends/imgui_impl_vulkan.cpp"
     PRIVATE "./imgui/backends/imgui_impl_win32.cpp"
 )
-target_include_directories(sample-testing
+target_include_directories(sample
     PRIVATE "./imgui"
     PRIVATE "./imgui/backends"
 )
 
 # STB Image
-target_include_directories(sample-testing
+target_include_directories(sample
     PRIVATE "./stb_image"
 )

samples/testing/extern/imgui/imconfig.h → sample/extern/imgui/imconfig.h

@@ -139,7 +139,7 @@
 //#define IMGUI_DEBUG_PARANOID
 
 //---- Indicate we're using VOLK for the render graph
-#define IMGUI_IMPL_VULKAN_USE_VOLK
+//#define IMGUI_IMPL_VULKAN_USE_VOLK
 
 //---- Tip: You can add extra functions within the ImGui:: namespace from anywhere (e.g. your own sources/header files)
 /*

samples/testing/src/main.cc → sample/src/main.cc

@@ -63,7 +63,7 @@ int main() {
 
     /* Initialize the Render Graph */
     RenderGraph rg = RenderGraph();
-    rg.set_shader_path("samples/testing/kernels");
+    rg.set_shader_path("sample/kernels");
     rg.set_max_graphs_in_flight(2u); /* Double buffering */
     if (const Result r = rg.init(gpu); r.is_err()) {
         printf("failed to initialize render graph.\nreason: %s\n", r.unwrap_err().c_str());
@@ -191,7 +191,7 @@ int main() {
     ImGui::CreateContext();
     ImGui_ImplGlfw_InitForVulkan(win, true);
     ImGUI imgui = ImGUI();
-    if (const Result r = imgui.init(gpu, rt, IMGUI_FUNCTIONS); r.is_err()) {
+    if (const Result r = imgui.init(gpu, rt); r.is_err()) {
         printf("failed to initialize imgui.\nreason: %s\n", r.unwrap_err().c_str());
         return EXIT_SUCCESS;
     }

src/core/graphite/gpu_adapter.cc

@@ -40,3 +40,15 @@ void AgnGPUAdapter::deinit_vram_bank() { delete vram_bank; }
 VRAMBank& AgnGPUAdapter::get_vram_bank() {
     return *vram_bank;
 }
+
+void AgnGPUAdapter::set_max_render_targets(const u32 count) { max_render_targets = count; }
+void AgnGPUAdapter::set_max_buffers(const u32 count) { max_buffers = count; }
+void AgnGPUAdapter::set_max_textures(const u32 count) { max_textures = count; }
+void AgnGPUAdapter::set_max_images(const u32 count) { max_images = count; }
+void AgnGPUAdapter::set_max_samplers(const u32 count) { max_samplers = count; }
+
+u32 AgnGPUAdapter::get_max_render_targets() const { return max_render_targets; }
+u32 AgnGPUAdapter::get_max_buffers() const { return max_buffers; }
+u32 AgnGPUAdapter::get_max_textures() const { return max_textures; }
+u32 AgnGPUAdapter::get_max_images() const { return max_images; }
+u32 AgnGPUAdapter::get_max_samplers() const { return max_samplers; }

src/core/graphite/gpu_adapter.hh

@@ -5,6 +5,8 @@
 #include "utils/result.hh"
 #include "utils/debug.hh"
 
+#include "utils/types.hh"
+
 class VRAMBank;
 
 /* Debug logger data. */
@@ -25,6 +27,13 @@ protected:
 
     /* VRAM bank for this GPU adapter. */
     VRAMBank* vram_bank = nullptr;
+
+    /* Maximum amount of resources. */
+    u32 max_render_targets = 8u;
+    u32 max_buffers = 8u;
+    u32 max_textures = 8u;
+    u32 max_images = 8u;
+    u32 max_samplers = 8u;
 
     /* Log a message using the active debug logger. */
     void log(DebugSeverity severity, const char* msg);
@@ -47,6 +56,20 @@ public:
 
     /* De-initialize the GPU adapter, free all its resources. */
     PLATFORM_SPECIFIC Result<void> deinit() = 0;
+
+    /* Set maximum resource count. */
+    void set_max_render_targets(const u32 count);
+    void set_max_buffers(const u32 count);
+    void set_max_textures(const u32 count);
+    void set_max_images(const u32 count);
+    void set_max_samplers(const u32 count);
+
+    /* Get maximum resource count. */
+    u32 get_max_render_targets() const;
+    u32 get_max_buffers() const;
+    u32 get_max_textures() const;
+    u32 get_max_images() const;
+    u32 get_max_samplers() const;
 };
 
 #include PLATFORM_INCLUDE(gpu_adapter)

src/core/graphite/nodes/compute_node.hh

@@ -19,6 +19,10 @@ public:
 
     u32 group_x = 1u, group_y = 1u, group_z = 1u; /* Thread group size */
     u32 work_x = 1u, work_y = 1u, work_z = 1u; /* Work size */
+
+    /* Indirect Dispatch. */
+    Buffer indirect_buffer {};
+    uint32_t indirect_offset = 0u;
 
     /* No copies allowed */
     ComputeNode(const ComputeNode&) = delete;
@@ -36,6 +40,9 @@ public:
     /* Set the work size for this node. (this will be divided by the `group_size` to get the dispatch size) */
     inline ComputeNode& work_size(u32 x, u32 y = 1u, u32 z = 1u) { work_x = x; work_y = y; work_z = z; return *this; }
 
+    /* Set the indirect_buffer which will be used to get the dispatch args buffer for the vkCmdDispatchIndirect call. */
+    inline ComputeNode& indirect_size(Buffer buffer) { indirect_buffer = buffer; return *this; }
+
     /* To access constructors */
     friend class AgnRenderGraph;
 };

src/core/graphite/nodes/raster_node.cc

@@ -35,6 +35,10 @@ DrawCall& RasterNode::draw(
     return draws.emplace_back(*this, vertex_buffer, vertex_count, vertex_offset, instance_count, instance_offset);
 }
 
+DrawCall& RasterNode::draw_indirect(const Buffer vertex_buffer, const Buffer indirect_buffer) {
+    return draws.emplace_back(*this, vertex_buffer, indirect_buffer);
+}
+
 RasterNode& RasterNode::attribute(const AttrFormat format) {
     attributes.emplace_back(format);
     return *this;
@@ -64,3 +68,10 @@ DrawCall::DrawCall(
         vertex_buffer, DependencyFlags::Readonly | DependencyFlags::Unbound, DependencyStages::Vertex
     );
 }
+
+DrawCall::DrawCall(RasterNode& parent_pass, const Buffer vertex_buffer, const Buffer indirect_buffer)
+    : parent_pass(parent_pass), vertex_buffer(vertex_buffer), indirect_buffer(indirect_buffer) {
+    parent_pass.dependencies.emplace_back(
+        vertex_buffer, DependencyFlags::Readonly | DependencyFlags::Unbound, DependencyStages::Vertex
+    );
+}

src/core/graphite/nodes/raster_node.hh

@@ -85,6 +85,8 @@ class RasterNode : public Node {
         const Buffer vertex_buffer, const u32 vertex_count, const u32 vertex_offset = 0u, const u32 instance_count = 1u,
         const u32 instance_offset = 0u
     );
+    /* Create an indirect draw call for this raster pass. */
+    DrawCall& draw_indirect(const Buffer vertex_buffer, const Buffer indirect_buffer);
 
     /* To access constructors */
     friend class AgnRenderGraph;
@@ -95,6 +97,7 @@ struct DrawCall {
     RasterNode& parent_pass;
 
     Buffer vertex_buffer {};
+    Buffer indirect_buffer {};
     u32 vertex_count = 0u, vertex_offset = 0u;
     u32 instance_count = 0u, instance_offset = 0u;
 
@@ -103,4 +106,6 @@ struct DrawCall {
         RasterNode& parent_pass, const Buffer vertex_buffer, const u32 vertex_count, const u32 vertex_offset,
         const u32 instance_count, const u32 instance_offset
     );
+    /* Vertex buffer and indirect draw call constructor. */
+    DrawCall(RasterNode& parent_pass, const Buffer vertex_buffer, const Buffer indirect_buffer);
 };

src/core/graphite/resources/buffer.hh

@@ -5,11 +5,12 @@
 
 /* Buffer usage flags. */
 enum class BufferUsage : u32 {
-    Invalid = 0u,           /* Invalid buffer usage. */
-    TransferDst = 1u << 1u, /* This buffer can be a GPU transfer destination. */
-    TransferSrc = 1u << 2u, /* This buffer can be a GPU transfer source. */
-    Constant = 1u << 3u,    /* Read-only buffer, aka. `UniformBuffer` */
-    Storage = 1u << 4u,     /* Read/Write buffer, aka. `StructuredBuffer` */
-    Vertex = 1u << 5u,      /* Vertex buffer */
+    Invalid = 0u,            /* Invalid buffer usage. */
+    TransferDst = 1u << 1u,  /* This buffer can be a GPU transfer destination. */
+    TransferSrc = 1u << 2u,  /* This buffer can be a GPU transfer source. */
+    Constant = 1u << 3u,     /* Read-only buffer, aka. `UniformBuffer` */
+    Storage = 1u << 4u,      /* Read/Write buffer, aka. `StructuredBuffer` */
+    Vertex = 1u << 5u,       /* Vertex buffer */
+    Indirect = 1u << 6u,     /* Draw/Dispatch Indirect Commands */
 };
 ENUM_CLASS_FLAGS(BufferUsage);

src/core/graphite/resources/texture.hh

@@ -16,9 +16,11 @@ ENUM_CLASS_FLAGS(TextureUsage);
 
 /* Texture formats. */
 enum class TextureFormat : u32 {
-    Invalid = 0u, /* Invalid texture format. */
-    RGBA8Unorm,   /* RGBA 8 bits per channel, unsigned normalized. */
-    EnumLimit     /* Anything above or equal is invalid. */
+    Invalid = 0u,  /* Invalid texture format. */
+    RGBA8Unorm,    /* RGBA 8 bits per channel, unsigned normalized. */
+    RG32Uint,      /* RG 32 bits per channel, unsigned integer. */
+    RG11B10Ufloat, /* RG 11 bits per channel, B 10 bits per channel, unsigned float. */
+    EnumLimit      /* Anything above or equal is invalid. */
 };
 
 /* Texture meta data. */

src/core/graphite/vram_bank.hh

@@ -79,6 +79,8 @@ public:
     PLATFORM_SPECIFIC Result<void> resize_render_target(RenderTarget& render_target, u32 width, u32 height) = 0;
     /* Resize a texture resource. */
     PLATFORM_SPECIFIC Result<void> resize_texture(Texture& texture, Size3D size) = 0;
+    /* Resize a buffer resource. */
+    PLATFORM_SPECIFIC Result<void> resize_buffer(Buffer& buffer, u64 count, u64 stride = 0) = 0;
 
     /* Upload data to a GPU buffer resource. */
     PLATFORM_SPECIFIC Result<void> upload_buffer(Buffer& buffer, const void* data, u64 dst_offset, u64 size) = 0;

src/platform/vulkan/gpu_adapter_vk.cc

@@ -109,32 +109,38 @@ Result<void> GPUAdapter::init(bool debug_mode) {
     device_queues_ci[2].queueCount = 1u;
     device_queues_ci[2].pQueuePriorities = &priority;
 
-    /* Enable descriptor indexing features */
-    VkPhysicalDeviceDescriptorIndexingFeaturesEXT desc_features { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES };
-    desc_features.descriptorBindingSampledImageUpdateAfterBind = true;
-    desc_features.descriptorBindingStorageBufferUpdateAfterBind = true;
-    desc_features.descriptorBindingPartiallyBound = true;
-    desc_features.runtimeDescriptorArray = true;
-
     /* Enable synchronization 2.0 features */
     VkPhysicalDeviceSynchronization2Features sync_features { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SYNCHRONIZATION_2_FEATURES };
-    sync_features.pNext = &desc_features;
     sync_features.synchronization2 = true;
 
     /* Enable dynamic rendering features */
     VkPhysicalDeviceDynamicRenderingFeatures render_features { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES };
     render_features.pNext = (void*)&sync_features;
     render_features.dynamicRendering = true;
 
+    /* Vulkan 1.2 features */
+    VkPhysicalDeviceVulkan12Features vulkan_features { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES };
+    vulkan_features.pNext = &render_features;
+    vulkan_features.shaderBufferInt64Atomics = true;
+    vulkan_features.descriptorBindingSampledImageUpdateAfterBind = true;
+    vulkan_features.descriptorBindingStorageBufferUpdateAfterBind = true;
+    vulkan_features.descriptorBindingPartiallyBound = true;
+    vulkan_features.runtimeDescriptorArray = true;
+
+    /* Enable modern device features */
+    VkPhysicalDeviceFeatures device_features {};
+    device_features.shaderInt64 = true; /* 64-bit integer support */
+
     /* Vulkan device creation info */
     VkDeviceCreateInfo device_ci { VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO };
-    device_ci.pNext = &render_features;
+    device_ci.pNext = &vulkan_features;
     device_ci.queueCreateInfoCount = 3u;
     device_ci.pQueueCreateInfos = device_queues_ci;
     device_ci.enabledLayerCount = instance_layers_count;
     device_ci.ppEnabledLayerNames = instance_layers;
     device_ci.enabledExtensionCount = device_ext_count;
     device_ci.ppEnabledExtensionNames = device_ext;
+    device_ci.pEnabledFeatures = &device_features;
 
     /* Create a Vulkan logical device */
     if (const VkResult r = vkCreateDevice(physical_device, &device_ci, nullptr, &logical_device); r != VK_SUCCESS) {