[#105] Sort out (some) of the vertex mess

projects/draw_indirect/src/main.cpp

@@ -227,12 +227,7 @@ int main(int argc, const char** argv) {
 
     // vertex layout for the pipeline. (assumed to be) used by all sponza meshes.
     const std::vector<vkcv::VertexAttachment> vertexAttachments = sponzaProgram.getVertexAttachments();
-    std::vector<vkcv::VertexBinding> bindings;
-    for (size_t i = 0; i < vertexAttachments.size(); i++)
-    {
-        bindings.push_back(vkcv::VertexBinding(i, { vertexAttachments[i] }));
-    }
-    const vkcv::VertexLayout sponzaVertexLayout (bindings);
+	const vkcv::VertexLayout sponzaVertexLayout({ vkcv::VertexBinding(0, { vertexAttachments }) });
 
     // recreation of VertexBufferBindings YET AGAIN,
     // since these are used in the command buffer to bind and draw from the vertex shaders
@@ -247,7 +242,6 @@ int main(int argc, const char** argv) {
                           compiledIndexBuffer,
                           indexedIndirectCommands);
 
-
     vkcv::Buffer<vk::DrawIndexedIndirectCommand> indirectBuffer = core.createBuffer<vk::DrawIndexedIndirectCommand>(
             vkcv::BufferType::INDIRECT,
             indexedIndirectCommands.size() * sizeof(vk::DrawIndexedIndirectCommand),

src/vkcv/VertexLayout.cpp

@@ -46,8 +46,8 @@ namespace vkcv {
         uint32_t offset = 0;
         for (auto &attachment : vertexAttachments)
         {
-            offset += getFormatSize(attachment.format);
             attachment.offset = offset;
+            offset += getFormatSize(attachment.format);
         }
         stride = offset;
     }