Skip to content

Commit

Permalink
Merge branch 'development' into dynamic_rendering
Browse files Browse the repository at this point in the history
  • Loading branch information
@johannesugb
johannesugb authored Apr 12, 2024
2 parents b09a326 + a260d0b commit 4cdd8e2
Show file tree
Hide file tree
Showing 5 changed files with 170 additions and 36 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
}
# note: if a specific vulkan version (e.g. 1.1.x, or < 1.2.135) needs testing, you can add it here:
# (not that ubuntu-latest (20.04) only supports >= v1.2.148 via apt)
vulkan-sdk: ["latest", "1.3.216"]
vulkan-sdk: ["latest", "1.3.216", "1.2.198"]
vma: ["ON", "OFF"]
exclude: # exclude combinations that are known to fail
- vulkan-sdk: "1.2.176"
- vulkan-sdk: "1.3.204"
vma: "ON"

steps:
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
shell: bash
working-directory: ${{ runner.workspace }}/build
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build .
run: cmake --build . --config $BUILD_TYPE

windows:
name: ${{ matrix.config.name }}, windows-2019, VulkanSDK ${{ matrix.vulkan-sdk }}, VMA=${{ matrix.vma }}
Expand Down Expand Up @@ -151,6 +151,9 @@ jobs:
$env:CC="${{ matrix.config.cc }}"
$env:CXX="${{ matrix.config.cxx }}"
$env:Path += ";${{ env.vulkan_sdk }}\;${{ env.vulkan_sdk }}\Bin\"
$env:VULKAN_SDK="${{ env.vulkan_sdk }}"
$env:Vulkan_LIBRARY="${{ env.vulkan_sdk }}/Bin"
$env:Vulkan_INCLUDE_DIR="${{ env.vulkan_sdk }}/Include"
# apparently checkout@v2 pulls to Auto-Vk/Auto-Vk on windows
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -Davk_LibraryType=STATIC ${{ runner.workspace }}/${{ github.event.repository.name }} -Davk_UseVMA=${{ matrix.vma }} -G "Visual Studio 16 2019" -A x64
Expand All @@ -160,7 +163,7 @@ jobs:
# apparently checkout@v2 pulls to Auto-Vk/Auto-Vk on windows
working-directory: ${{ runner.workspace }}/${{ github.event.repository.name }}/build
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build .
run: cmake --build . --config $BUILD_TYPE

windows-latest:
name: ${{ matrix.config.name }}, windows-latest, VulkanSDK ${{ matrix.vulkan-sdk }}, VMA=${{ matrix.vma }}
Expand All @@ -176,8 +179,8 @@ jobs:
cc: "cl",
cxx: "cl"
}
# note: if a specific vulkan version (e.g. 1.1.x, or < 1.2.135) needs testing, you can add it here:
vulkan-sdk: ["latest", "1.3.216.0", "1.2.198.1"]
# note: if a specific vulkan version needs testing, you can add it here:
vulkan-sdk: ["latest", "1.3.204.1", "1.3.216.0"]
vma: ["ON", "OFF"]
exclude: # exclude combinations that are known to fail
- vulkan-sdk: "1.2.198"
Expand Down Expand Up @@ -223,6 +226,9 @@ jobs:
$env:Vulkan_LIBRARY="${{ env.vulkan_sdk }}/Bin"
$env:Vulkan_INCLUDE_DIR="${{ env.vulkan_sdk }}/Include"
$env:Path += ";${{ env.vulkan_sdk }}\;${{ env.vulkan_sdk }}\Bin\"
$env:VULKAN_SDK="${{ env.vulkan_sdk }}"
$env:Vulkan_LIBRARY="${{ env.vulkan_sdk }}/Bin"
$env:Vulkan_INCLUDE_DIR="${{ env.vulkan_sdk }}/Include"
# apparently checkout@v2 pulls to Auto-Vk/Auto-Vk on windows
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -Davk_LibraryType=STATIC ${{ runner.workspace }}/${{ github.event.repository.name }} -Davk_UseVMA=${{ matrix.vma }} -G "Visual Studio 17 2022" -A x64
Expand All @@ -232,4 +238,4 @@ jobs:
# apparently checkout@v3 pulls to Auto-Vk/Auto-Vk on windows
working-directory: ${{ runner.workspace }}/${{ github.event.repository.name }}/build
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build .
run: cmake --build . --config $BUILD_TYPE
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ I.e., the big, important concepts, which make Vulkan as performant as it can be-
# Setup

_Auto-Vk_ requires
* A Vulkan 1.2 SDK or a Vulkan 1.3 SDK
* A Vulkan 1.3 SDK
* [Vulkan-Hpp](https://github.com/KhronosGroup/Vulkan-Hpp)
* A C++20 compiler

Expand Down
136 changes: 136 additions & 0 deletions include/avk/commands.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,142 @@ namespace avk
bind_vertex_buffer(aHandlePtr + 1, aOffsetPtr + 1, aRest...);
}

/** Draw vertices with vertex buffer bindings starting at BUFFER-BINDING #0 top to the number of total buffers passed -1.
* "BUFFER-BINDING" means that it corresponds to the binding specified in `input_binding_location_data::from_buffer_at_binding`.
* There can be no gaps between buffer bindings.
* @param aFurtherBuffers Multiple const-references to buffers, or tuples of const-references to buffers + offsets.
* First case: Pass const buffer_t& types!
* Second case: Pass tuples of type std::tuple<const buffer_t&, size_t>!
* Hint: std::forward_as_tuple might be useful to get that reference into a std::tuple.
* Example: avk::buffer myVertexBuffer;
* auto myTuple = std::forward_as_tuple(myVertexBuffer.get(), size_t{0});
*/
template <typename... Bfrs>
action_type_command draw_vertices_indirect(const buffer_t& aParametersBuffer, vk::DeviceSize aParametersOffset, uint32_t aParametersStride, uint32_t aDrawCount, const Bfrs&... aFurtherBuffers)
{
constexpr size_t N = sizeof...(aFurtherBuffers);

if constexpr (N == 0) {
return action_type_command{
avk::sync::sync_hint {
{{ // DESTINATION dependencies for previous commands:
vk::PipelineStageFlagBits2KHR::eAllGraphics,
vk::AccessFlagBits2KHR::eInputAttachmentRead | vk::AccessFlagBits2KHR::eColorAttachmentRead | vk::AccessFlagBits2KHR::eColorAttachmentWrite | vk::AccessFlagBits2KHR::eDepthStencilAttachmentRead | vk::AccessFlagBits2KHR::eDepthStencilAttachmentWrite
}},
{{ // SOURCE dependencies for subsequent commands:
vk::PipelineStageFlagBits2KHR::eAllGraphics,
vk::AccessFlagBits2KHR::eColorAttachmentWrite | vk::AccessFlagBits2KHR::eDepthStencilAttachmentWrite
}}
},
{}, // no resource-specific sync hints
[
lParametersBufferHandle = aParametersBuffer.handle(), aParametersOffset, aParametersStride, aDrawCount
](avk::command_buffer_t& cb) {
cb.handle().drawIndirect(lParametersBufferHandle, aParametersOffset, aDrawCount, aParametersStride);
}
};
}
else {
std::array<vk::Buffer, N> handles;
std::array<vk::DeviceSize, N> offsets;
bind_vertex_buffer(&handles[0], &offsets[0], aFurtherBuffers...);

return action_type_command{
avk::sync::sync_hint {
{{ // DESTINATION dependencies for previous commands:
vk::PipelineStageFlagBits2KHR::eAllGraphics,
vk::AccessFlagBits2KHR::eInputAttachmentRead | vk::AccessFlagBits2KHR::eColorAttachmentRead | vk::AccessFlagBits2KHR::eColorAttachmentWrite | vk::AccessFlagBits2KHR::eDepthStencilAttachmentRead | vk::AccessFlagBits2KHR::eDepthStencilAttachmentWrite
}},
{{ // SOURCE dependencies for subsequent commands:
vk::PipelineStageFlagBits2KHR::eAllGraphics,
vk::AccessFlagBits2KHR::eColorAttachmentWrite | vk::AccessFlagBits2KHR::eDepthStencilAttachmentWrite
}}
},
{}, // no resource-specific sync hints
[
lBindingCount = static_cast<uint32_t>(N),
lParametersBufferHandle = aParametersBuffer.handle(), aParametersOffset, aParametersStride, aDrawCount,
handles, offsets
](avk::command_buffer_t& cb) {
cb.handle().bindVertexBuffers(
0u, // TODO: Should the first binding really always be 0?
static_cast<uint32_t>(N), handles.data(), offsets.data()
);
cb.handle().drawIndirect(lParametersBufferHandle, aParametersOffset, aDrawCount, aParametersStride);
}
};
}
}

/** Draw vertices with vertex buffer bindings starting at BUFFER-BINDING #0 top to the number of total buffers passed -1.
* "BUFFER-BINDING" means that it corresponds to the binding specified in `input_binding_location_data::from_buffer_at_binding`.
* There can be no gaps between buffer bindings.
* @param aFurtherBuffers Multiple const-references to buffers, or tuples of const-references to buffers + offsets.
* First case: Pass const buffer_t& types!
* Second case: Pass tuples of type std::tuple<const buffer_t&, size_t>!
* Hint: std::forward_as_tuple might be useful to get that reference into a std::tuple.
* Example: avk::buffer myVertexBuffer;
* auto myTuple = std::forward_as_tuple(myVertexBuffer.get(), size_t{0});
*/
template <typename... Bfrs>
action_type_command draw_vertices_indirect_count(const buffer_t& aParametersBuffer, vk::DeviceSize aParametersOffset, uint32_t aParametersStride, const buffer_t& aDrawCountBuffer, vk::DeviceSize aDrawCountOffset, uint32_t aMaxNumberOfDraws, const Bfrs&... aFurtherBuffers)
{
constexpr size_t N = sizeof...(aFurtherBuffers);

if constexpr (N == 0) {
return action_type_command{
avk::sync::sync_hint {
{{ // DESTINATION dependencies for previous commands:
vk::PipelineStageFlagBits2KHR::eAllGraphics,
vk::AccessFlagBits2KHR::eInputAttachmentRead | vk::AccessFlagBits2KHR::eColorAttachmentRead | vk::AccessFlagBits2KHR::eColorAttachmentWrite | vk::AccessFlagBits2KHR::eDepthStencilAttachmentRead | vk::AccessFlagBits2KHR::eDepthStencilAttachmentWrite
}},
{{ // SOURCE dependencies for subsequent commands:
vk::PipelineStageFlagBits2KHR::eAllGraphics,
vk::AccessFlagBits2KHR::eColorAttachmentWrite | vk::AccessFlagBits2KHR::eDepthStencilAttachmentWrite
}}
},
{}, // no resource-specific sync hints
[
lParametersBufferHandle = aParametersBuffer.handle(), aParametersOffset, aParametersStride,
lDrawCountBufferHandle = aDrawCountBuffer.handle(), aDrawCountOffset, aMaxNumberOfDraws
](avk::command_buffer_t& cb) {
cb.handle().drawIndirectCount(lParametersBufferHandle, aParametersOffset, lDrawCountBufferHandle, aDrawCountOffset, aMaxNumberOfDraws, aParametersStride);
}
};
}
else {
std::array<vk::Buffer, N> handles;
std::array<vk::DeviceSize, N> offsets;
bind_vertex_buffer(&handles[0], &offsets[0], aFurtherBuffers...);

return action_type_command{
avk::sync::sync_hint {
{{ // DESTINATION dependencies for previous commands:
vk::PipelineStageFlagBits2KHR::eAllGraphics,
vk::AccessFlagBits2KHR::eInputAttachmentRead | vk::AccessFlagBits2KHR::eColorAttachmentRead | vk::AccessFlagBits2KHR::eColorAttachmentWrite | vk::AccessFlagBits2KHR::eDepthStencilAttachmentRead | vk::AccessFlagBits2KHR::eDepthStencilAttachmentWrite
}},
{{ // SOURCE dependencies for subsequent commands:
vk::PipelineStageFlagBits2KHR::eAllGraphics,
vk::AccessFlagBits2KHR::eColorAttachmentWrite | vk::AccessFlagBits2KHR::eDepthStencilAttachmentWrite
}}
},
{}, // no resource-specific sync hints
[
lBindingCount = static_cast<uint32_t>(N),
lParametersBufferHandle = aParametersBuffer.handle(), aParametersOffset, aParametersStride,
lDrawCountBufferHandle = aDrawCountBuffer.handle(), aDrawCountOffset, aMaxNumberOfDraws,
handles, offsets
](avk::command_buffer_t& cb) {
cb.handle().bindVertexBuffers(
0u, // TODO: Should the first binding really always be 0?
static_cast<uint32_t>(N), handles.data(), offsets.data()
);
cb.handle().drawIndirectCount(lParametersBufferHandle, aParametersOffset, lDrawCountBufferHandle, aDrawCountOffset, aMaxNumberOfDraws, aParametersStride);
}
};
}
}

/** Draw vertices with vertex buffer bindings starting at BUFFER-BINDING #0 top to the number of total buffers passed -1.
* "BUFFER-BINDING" means that it corresponds to the binding specified in `input_binding_location_data::from_buffer_at_binding`.
* There can be no gaps between buffer bindings.
Expand Down
41 changes: 15 additions & 26 deletions include/avk/cpp_utils.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,39 +69,28 @@ namespace avk
}

/** Load a binary file into memory.
* Adapted from: http://www.cplusplus.com/reference/istream/istream/read/
* Adapted from: https://coniferproductions.com/posts/2022/10/25/reading-binary-files-cpp/
*/
static std::vector<char> load_binary_file(std::string path)
{
std::vector<char> buffer;
std::ifstream is(path.c_str(), std::ifstream::binary);
if (!is) {
throw avk::runtime_error("Couldn't load file '" + path + "'");
try {
std::filesystem::path inputFilePath{path};
auto length = std::filesystem::file_size(inputFilePath);
if (length == 0) {
throw avk::runtime_error("Couldn't load file '" + path + "'. It appears to be empty.");
}
std::vector<char> buffer(((length + 3) / 4) * 4);
std::ifstream inputFile(path, std::ios_base::binary);
inputFile.read(reinterpret_cast<char*>(buffer.data()), length);
inputFile.close();
return buffer;
}

// get length of file:
is.seekg(0, is.end);
size_t length = is.tellg();
is.seekg(0, is.beg);

buffer.resize(length);

// read data as a block:
is.read(buffer.data(), length);

if (!is) {
is.close();
throw avk::runtime_error(
"Couldn't read file '" + path + "' into buffer. " +
"load_binary_file could only read " + std::to_string(is.gcount()) + " bytes instead of " + std::to_string(length)
);
catch (std::filesystem::filesystem_error& e)
{
throw avk::runtime_error("Couldn't load file '" + path + "'. Reason: " + e.what());
}

is.close();
return buffer;
}


static std::string trim_spaces(std::string_view s)
{
if (s.empty()) {
Expand Down
7 changes: 5 additions & 2 deletions src/avk.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2901,12 +2901,15 @@ namespace avk
void command_buffer_t::prepare_for_reuse()
{
if (mPostExecutionHandler.has_value()) {
// Clear post-execution handler
// If there is a post-execution handler => call it now:
invoke_post_execution_handler();
// Clear post-execution handler:
mPostExecutionHandler.reset();
}
if (mCustomDeleter.has_value() && *mCustomDeleter) {
// If there is a custom deleter => call it now
// If there is a custom deleter => call it now:
(*mCustomDeleter)();
// Clear custom deleter:
mCustomDeleter.reset();
}
mLifetimeHandledResources.clear();
Expand Down

0 comments on commit 4cdd8e2

Please sign in to comment.