Skip to content

fix: Expose dst_array_element for write descriptors + additional cleanup for vk::buffer_parameters #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrparmesan01 merged 5 commits into from
Jun 2, 2026
Merged

fix: Expose dst_array_element for write descriptors + additional cleanup for vk::buffer_parameters #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e4d9fd
removing vk::memory_property parameter from the vk::buffer_parameter …
mrparmesan01 Jun 2, 2026
1ec4ac9
added parameter for setting the dst_array_element when updating descr…
mrparmesan01 Jun 2, 2026
8c5ae5a
maintenance: Code cleanup removing dead code
mrparmesan01 Jun 2, 2026
3521568
Formatted unformatted code using clang-format
mrparmesan01 Jun 2, 2026
5d43acb
Updated workflow for GitHub actions
mrparmesan01 Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: 🛠️ CI

on: [pull_request]


jobs:
clang-format:
uses: engine3d-dev/ci/.github/workflows/clang-format.yml@main
Expand All @@ -11,19 +12,19 @@ jobs:
uses: engine3d-dev/ci/.github/workflows/windows.yml@main
with:
package_name: "vulkan-cpp"
version: "6.0"
version: "6.1"
secrets: inherit

linux:
uses: engine3d-dev/ci/.github/workflows/linux.yml@main
with:
package_name: "vulkan-cpp"
version: "6.0"
version: "6.1"
secrets: inherit

mac:
uses: engine3d-dev/ci/.github/workflows/mac.yml@main
with:
package_name: "vulkan-cpp"
version: "6.0"
version: "6.1"
secrets: inherit
2 changes: 1 addition & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class VulkanCppRecipe(ConanFile):
name = "vulkan-cpp"
version = "6.0"
version = "6.1"
license = "Apache-2.0"
url = "https://github.com/engine3d-dev/vulkan-cpp"
homepage = "https://github.com/engine3d-dev/vulkan-cpp"
Expand Down
2 changes: 1 addition & 1 deletion demos/1-instance/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
18 changes: 7 additions & 11 deletions demos/10-textures/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,11 @@ main() {
}
};
//! @brief Creating vertex/index buffers with host visibility flags
const auto property_flags =
static_cast<vk::memory_property>(vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit);

vk::buffer_parameters vertex_params = {
.memory_mask = physical_device.memory_properties(property_flags),
.property_flags = vk::memory_property::device_local_bit,
.memory_mask = physical_device.memory_properties(
vk::memory_property::device_local_bit |
vk::memory_property::host_visible_bit),
.usage = vk::buffer_usage::transfer_dst_bit |
vk::buffer_usage::vertex_buffer_bit,
};
Expand All @@ -488,8 +486,7 @@ main() {
std::array<uint32_t, 6> indices = { 0, 1, 2, 2, 3, 0 };

vk::buffer_parameters index_params = {
.memory_mask = physical_device.memory_properties(property_flags),
.property_flags = static_cast<vk::memory_property>(
.memory_mask = physical_device.memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::index_buffer_bit,
Expand All @@ -498,10 +495,9 @@ main() {

// Setting up descriptor sets for handling uniforms
vk::buffer_parameters uniform_params = {
.memory_mask =
physical_device.memory_properties(static_cast<vk::memory_property>(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit)),
.memory_mask = physical_device.memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::uniform_buffer_bit,
};
vk::uniform_buffer test_ubo = vk::uniform_buffer(
Expand Down
2 changes: 1 addition & 1 deletion demos/10-textures/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
16 changes: 6 additions & 10 deletions demos/11-depth-buffering/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,15 +525,11 @@ main() {
}
};

//! @brief Setting host visibility property flags
const auto property_flags =
static_cast<vk::memory_property>(vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit);

// Creating vertex buffers
vk::buffer_parameters vertex_params = {
.memory_mask = physical_device.memory_properties(property_flags),
.property_flags = vk::memory_property::device_local_bit,
.memory_mask = physical_device.memory_properties(
vk::memory_property::device_local_bit |
vk::memory_property::host_visible_bit),
.usage = vk::buffer_usage::transfer_dst_bit |
vk::buffer_usage::vertex_buffer_bit,
};
Expand All @@ -542,9 +538,9 @@ main() {
// Creating index buffers
std::array<uint32_t, 12> indices = { 0, 1, 2, 2, 3, 0, 4, 5, 6, 6, 7, 4 };
vk::buffer_parameters index_params = {
.memory_mask = physical_device.memory_properties(property_flags),
.property_flags = vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit,
.memory_mask = physical_device.memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::index_buffer_bit,
};
vk::index_buffer test_ibo(logical_device, indices, index_params);
Expand Down
2 changes: 1 addition & 1 deletion demos/11-depth-buffering/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
12 changes: 4 additions & 8 deletions demos/12-loading-models/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,20 +161,16 @@ class obj_model {
m_indices_size = indices.size();

//! @brief Creating vertex/index buffers with host visibility flags
const auto property_flags = static_cast<vk::memory_property>(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit);

vk::buffer_parameters vertex_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = vk::memory_property::device_local_bit,
.memory_mask = p_physical.memory_properties(
vk::memory_property::device_local_bit |
vk::memory_property::host_visible_bit),
.usage = vk::buffer_usage::transfer_dst_bit |
vk::buffer_usage::vertex_buffer_bit,
};

vk::buffer_parameters index_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = static_cast<vk::memory_property>(
.memory_mask = p_physical.memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::index_buffer_bit,
Expand Down
2 changes: 1 addition & 1 deletion demos/12-loading-models/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 1 addition & 1 deletion demos/13-skybox/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
10 changes: 0 additions & 10 deletions demos/13-skybox/environment_map.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ public:
.memory_mask = m_physical_device->memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.property_flags = static_cast<vk::memory_property>(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::transfer_src_bit,
};

Expand All @@ -104,11 +101,6 @@ public:
m_skybox_image = vk::sample_image(m_device, skybox_image_params);

// Transferring data from the CPU
// void* data = nullptr;
// vkMapMemory(m_device, staging_memory, 0, total_size_bytes, 0,
// &data); std::memcpy(data, pixels,
// static_cast<size_t>(total_size_bytes)); vkUnmapMemory(m_device,
// staging_memory);
std::span<const uint8_t> pixels_data(
reinterpret_cast<const uint8_t*>(pixels), image_size);
staging_buffer.transfer(pixels_data);
Expand Down Expand Up @@ -331,8 +323,6 @@ public:
.memory_mask = m_physical_device->memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.property_flags = vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit,
.usage = vk::buffer_usage::transfer_dst_bit |
vk::buffer_usage::vertex_buffer_bit,
};
Expand Down
8 changes: 4 additions & 4 deletions demos/14-imgui/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ class obj_model {
vk::memory_property::host_cached_bit);

vk::buffer_parameters vertex_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = vk::memory_property::device_local_bit,
.memory_mask = p_physical.memory_properties(
vk::memory_property::device_local_bit |
vk::memory_property::host_visible_bit),
.usage = vk::buffer_usage::transfer_dst_bit |
vk::buffer_usage::vertex_buffer_bit,
};

vk::buffer_parameters index_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = static_cast<vk::memory_property>(
.memory_mask = p_physical.memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::index_buffer_bit,
Expand Down
2 changes: 1 addition & 1 deletion demos/14-imgui/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
12 changes: 3 additions & 9 deletions demos/15-dynamic-rendering/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,15 @@ class obj_model {
m_indices_size = vertices.size();
m_indices_size = indices.size();

//! @brief Creating vertex/index buffers with host visibility flags
const auto property_flags = static_cast<vk::memory_property>(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit);

vk::buffer_parameters vertex_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = vk::memory_property::device_local_bit,
.memory_mask = p_physical.memory_properties(
vk::memory_property::device_local_bit),
.usage = vk::buffer_usage::transfer_dst_bit |
vk::buffer_usage::vertex_buffer_bit,
};

vk::buffer_parameters index_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = static_cast<vk::memory_property>(
.memory_mask = p_physical.memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::index_buffer_bit,
Expand Down
2 changes: 1 addition & 1 deletion demos/15-dynamic-rendering/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
8 changes: 4 additions & 4 deletions demos/16-descriptor-indexing/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ class obj_model {
vk::memory_property::host_cached_bit);

vk::buffer_parameters vertex_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = vk::memory_property::device_local_bit,
.memory_mask = p_physical.memory_properties(
vk::memory_property::device_local_bit |
vk::memory_property::host_visible_bit),
.usage = vk::buffer_usage::transfer_dst_bit |
vk::buffer_usage::vertex_buffer_bit,
};

vk::buffer_parameters index_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = static_cast<vk::memory_property>(
.memory_mask = p_physical.memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::index_buffer_bit,
Expand Down
2 changes: 1 addition & 1 deletion demos/16-descriptor-indexing/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
13 changes: 4 additions & 9 deletions demos/17-buffer-device-address/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,21 +161,16 @@ class obj_model {
m_indices_size = vertices.size();
m_indices_size = indices.size();

//! @brief Creating vertex/index buffers with host visibility flags
const auto property_flags = static_cast<vk::memory_property>(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit);

vk::buffer_parameters vertex_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = vk::memory_property::device_local_bit,
.memory_mask = p_physical.memory_properties(
vk::memory_property::device_local_bit |
vk::memory_property::host_visible_bit),
.usage = vk::buffer_usage::transfer_dst_bit |
vk::buffer_usage::vertex_buffer_bit,
};

vk::buffer_parameters index_params = {
.memory_mask = p_physical.memory_properties(property_flags),
.property_flags = static_cast<vk::memory_property>(
.memory_mask = p_physical.memory_properties(
vk::memory_property::host_visible_bit |
vk::memory_property::host_cached_bit),
.usage = vk::buffer_usage::index_buffer_bit,
Expand Down
2 changes: 1 addition & 1 deletion demos/17-buffer-device-address/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 1 addition & 1 deletion demos/2-physical-device/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 1 addition & 1 deletion demos/3-logical-device/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 1 addition & 1 deletion demos/4-surface/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 1 addition & 1 deletion demos/5-swapchain/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
2 changes: 1 addition & 1 deletion demos/6-graphics-pipeline/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def requirements(self):
self.requires("glm/1.0.1")
self.requires("stb/cci.20230920")
self.requires("tinyobjloader/2.0.0-rc10")
self.requires("vulkan-cpp/6.0")
self.requires("vulkan-cpp/6.1")

def build(self):
cmake = CMake(self)
Expand Down
Loading
Loading