Skip to content
Snippets Groups Projects
Commit 88fbaef4 authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

Merge branch 'develop' into 69-partikelsystem

parents 8ac57685 bc9901c6
No related branches found
No related tags found
1 merge request!56Resolve "Partikelsystem"
Pipeline #25692 failed
...@@ -142,7 +142,8 @@ namespace vkcv { ...@@ -142,7 +142,8 @@ namespace vkcv {
std::pair descriptor(comp.get_decoration(u.id, spv::DecorationDescriptorSet), std::pair descriptor(comp.get_decoration(u.id, spv::DecorationDescriptorSet),
DescriptorBinding(comp.get_decoration(u.id, spv::DecorationBinding), DescriptorType::UNIFORM_BUFFER, base_type.vecsize, shaderStage)); DescriptorBinding(comp.get_decoration(u.id, spv::DecorationBinding), DescriptorType::UNIFORM_BUFFER, base_type.vecsize, shaderStage));
bindings.push_back(descriptor); bindings.push_back(descriptor);
if (comp.get_decoration(u.id, spv::DecorationDescriptorSet) > maxSetID) maxSetID = comp.get_decoration(u.id, spv::DecorationDescriptorSet); if ((int32_t)comp.get_decoration(u.id, spv::DecorationDescriptorSet) > maxSetID)
maxSetID = comp.get_decoration(u.id, spv::DecorationDescriptorSet);
} }
for (uint32_t i = 0; i < resources.storage_buffers.size(); i++) { for (uint32_t i = 0; i < resources.storage_buffers.size(); i++) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment