Merge pull request #38 from engine3d-dev/small_fixes

SpinnerX · web-flow · commit e33e3af276d8 · 2026-03-05T23:42:03.000-08:00
* Replaced C-style casts with static_cast
* Added VkBufferUsage enums to vulkan-cpp vk::buffer_usage enum equivalent
* Additional minor bug fixes.
diff --git a/vulkan-cpp/index_buffer.cppm b/vulkan-cpp/index_buffer.cppm
@@ -2,7 +2,6 @@ module;
 
 #include <vulkan/vulkan.h>
 #include <span>
-#include <array>
 
 export module vk:index_buffer;
 
@@ -21,13 +20,11 @@ export namespace vk {
                         const index_params& p_info) : m_device(p_device) {
                 m_indices_count = p_info.indices.size();
 
-                uint32_t property_flags =
-                memory_property::host_visible_bit | memory_property::host_cached_bit;
                 buffer_parameters index_params = {
                     .device_size = p_info.indices.size_bytes(),
                     .physical_memory_properties = p_info.phsyical_memory_properties,
-                    .property_flags = (memory_property)property_flags,
-                    .usage = VK_BUFFER_USAGE_INDEX_BUFFER_BIT,
+                    .property_flags = static_cast<memory_property>(memory_property::host_visible_bit | memory_property::host_cached_bit),
+                    .usage = static_cast<VkBufferUsageFlags>(buffer_usage::index_buffer_bit),
                     .debug_name = p_info.debug_name.c_str(),
                     .vkSetDebugUtilsObjectNameEXT = p_info.vkSetDebugUtilsObjectNameEXT
                 };
@@ -41,9 +38,9 @@ export namespace vk {
 
             [[nodiscard]] uint32_t size() const { return m_indices_count; }
 
-            void bind(const VkCommandBuffer& p_current) {
+            void bind(const VkCommandBuffer& p_current, uint64_t p_offset = 0) {
                 vkCmdBindIndexBuffer(
-                    p_current, m_index_buffer, 0, VK_INDEX_TYPE_UINT32);
+                    p_current, m_index_buffer, p_offset, VK_INDEX_TYPE_UINT32);
             }
 
             operator VkBuffer() const { return m_index_buffer; }
diff --git a/vulkan-cpp/types.cppm b/vulkan-cpp/types.cppm
@@ -795,6 +795,42 @@ export namespace vk {
             one_minus_src1_alpha = VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA
         };
 
+        enum class buffer_usage : uint32_t {
+            transfer_src_bit = VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
+            transfer_dst_bit = VK_BUFFER_USAGE_TRANSFER_DST_BIT,
+            uniform_texel_buffer_bit = VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT,
+            storage_texel_buffer_bit = VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT,
+            uniform_buffer_bit = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
+            storage_buffer_bit = VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
+            index_buffer_bit = VK_BUFFER_USAGE_INDEX_BUFFER_BIT,
+            vertex_buffer_bit = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT,
+            indirect_buffer_bit = VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT,
+            shader_device_address_bit = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT,
+            video_decode_src_bit_khr = VK_BUFFER_USAGE_VIDEO_DECODE_SRC_BIT_KHR,
+            video_decode_dst_bit_khr = VK_BUFFER_USAGE_VIDEO_DECODE_DST_BIT_KHR,
+            transform_feedback_buffer_bit_ext = VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT,
+            transform_feedback_counter_buffer_bit_ext = VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT,
+            conditoinal_rendering_bit_ext = VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT,
+            #ifdef VK_ENABLE_BETA_EXTENSIONS
+            execution_graph_scratch_bit_amdx = VK_BUFFER_USAGE_EXECUTION_GRAPH_SCRATCH_BIT_AMDX,
+            #endif
+            acceleration_structure_build_input_read_only_bit_khr = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR,
+            acceleration_structure_storage_bit_khr = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR,
+            shader_binding_table_bit_khr = VK_BUFFER_USAGE_SHADER_BINDING_TABLE_BIT_KHR,
+            video_encode_dst_bit_khr = VK_BUFFER_USAGE_VIDEO_ENCODE_DST_BIT_KHR,
+            encode_src_bit_khr = VK_BUFFER_USAGE_VIDEO_ENCODE_SRC_BIT_KHR,
+            sampler_descriptor_buffer_bit_ext = VK_BUFFER_USAGE_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT,
+            descriptor_buffer_bit_ext = VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,
+            descriptors_descriptor_buffer_bit_ext = VK_BUFFER_USAGE_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT,
+            micromap_build_input_read_only_bit_ext = VK_BUFFER_USAGE_MICROMAP_BUILD_INPUT_READ_ONLY_BIT_EXT,
+            micromap_storage_bit_ext = VK_BUFFER_USAGE_MICROMAP_STORAGE_BIT_EXT,
+            // tile_memory_bit_qcom = VK_BUFFER_USAGE_TILE_MEMORY_BIT_QCOM,
+            ray_tracing_bit_nv = VK_BUFFER_USAGE_RAY_TRACING_BIT_NV,
+            shader_device_address_bit_ext = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_EXT,
+            shader_device_address_bit_khr = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR,
+            flags_bit_max_enum = VK_BUFFER_USAGE_FLAG_BITS_MAX_ENUM
+        };
+
         enum class blend_op : uint32_t {
             add                    = VK_BLEND_OP_ADD,
             subtract               = VK_BLEND_OP_SUBTRACT,
@@ -1463,7 +1499,7 @@ export namespace vk {
             memory_property property_flags;
             VkBufferUsageFlags usage;
             VkSharingMode share_mode = VK_SHARING_MODE_EXCLUSIVE;
-            const char* debug_name = "NA";
+            const char* debug_name = nullptr;
             PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT =
               nullptr;
         };
