diff --git a/projects/cmd_sync_test/src/main.cpp b/projects/cmd_sync_test/src/main.cpp index eccc0af7331dc140f3a15ddf12c5645e685abc90..6e53eb8c5ec1825135778dc91b11dd6e45f44276 100644 --- a/projects/cmd_sync_test/src/main.cpp +++ b/projects/cmd_sync_test/src/main.cpp @@ -175,8 +175,8 @@ int main(int argc, const char** argv) { std::vector<vkcv::DrawcallInfo> shadowDrawcalls; for (const auto& position : instancePositions) { modelMatrices.push_back(glm::translate(glm::mat4(1.f), position)); - drawcalls.push_back(vkcv::DrawcallInfo(loadedMesh, { descriptorUsage })); - shadowDrawcalls.push_back(vkcv::DrawcallInfo(loadedMesh, {})); + drawcalls.push_back(vkcv::DrawcallInfo(loadedMesh, { descriptorUsage },1)); + shadowDrawcalls.push_back(vkcv::DrawcallInfo(loadedMesh, {},1)); } modelMatrices.back() *= glm::scale(glm::mat4(1.f), glm::vec3(10.f, 1.f, 10.f)); diff --git a/projects/first_mesh/src/main.cpp b/projects/first_mesh/src/main.cpp index 5b7bc1edb7ab1b645f713098170bd5aa50657b91..e7546fc3a143b3638cceb36869c519336ebec751 100644 --- a/projects/first_mesh/src/main.cpp +++ b/projects/first_mesh/src/main.cpp @@ -150,7 +150,7 @@ int main(int argc, const char** argv) { const vkcv::Mesh renderMesh(vertexBufferBindings, indexBuffer.getVulkanHandle(), mesh.vertexGroups[0].numIndices); vkcv::DescriptorSetUsage descriptorUsage(0, core.getDescriptorSet(descriptorSet).vulkanHandle); - vkcv::DrawcallInfo drawcall(renderMesh, { descriptorUsage }); + vkcv::DrawcallInfo drawcall(renderMesh, { descriptorUsage },1); vkcv::camera::CameraManager cameraManager(window); uint32_t camIndex0 = cameraManager.addCamera(vkcv::camera::ControllerType::PILOT); diff --git a/projects/first_scene/src/main.cpp b/projects/first_scene/src/main.cpp index 420400cdd04865ddd48eec7cf6000e36417d8095..521818732f7a60eabe9f0c2c080c6d343a71b1d8 100644 --- a/projects/first_scene/src/main.cpp +++ b/projects/first_scene/src/main.cpp @@ -199,7 +199,7 @@ int main(int argc, const char** argv) { vkcv::DescriptorSetUsage descriptorUsage(0, core.getDescriptorSet(descriptorSets[i]).vulkanHandle); - drawcalls.push_back(vkcv::DrawcallInfo(renderMesh, {descriptorUsage})); + drawcalls.push_back(vkcv::DrawcallInfo(renderMesh, {descriptorUsage},1)); } std::vector<glm::mat4> modelMatrices; diff --git a/projects/first_triangle/src/main.cpp b/projects/first_triangle/src/main.cpp index 20cfdddf5c1baa9e8727312daa36de94bd56672f..5bdd55a263f4d81d8f424c056d7d6c0b54ccb1ca 100644 --- a/projects/first_triangle/src/main.cpp +++ b/projects/first_triangle/src/main.cpp @@ -167,7 +167,7 @@ int main(int argc, const char** argv) { vkcv::ImageHandle swapchainImageHandle = vkcv::ImageHandle::createSwapchainImageHandle(); const vkcv::Mesh renderMesh({}, triangleIndexBuffer.getVulkanHandle(), 3); - vkcv::DrawcallInfo drawcall(renderMesh, {}); + vkcv::DrawcallInfo drawcall(renderMesh, {},1); const vkcv::ImageHandle swapchainInput = vkcv::ImageHandle::createSwapchainImageHandle(); diff --git a/projects/voxelization/src/Voxelization.cpp b/projects/voxelization/src/Voxelization.cpp index b04fab9a2b61430d24bd7171d9fd3637dd428699..30ae5f2ec80d4a8ef455e2ae47843275491d88c6 100644 --- a/projects/voxelization/src/Voxelization.cpp +++ b/projects/voxelization/src/Voxelization.cpp @@ -236,7 +236,7 @@ void Voxelization::voxelizeMeshes( { vkcv::DescriptorSetUsage(0, m_corePtr->getDescriptorSet(m_voxelizationDescriptorSet).vulkanHandle), vkcv::DescriptorSetUsage(1, m_corePtr->getDescriptorSet(perMeshDescriptorSets[i]).vulkanHandle) - })); + },1)); } m_corePtr->recordDrawcallsToCmdStream( @@ -273,7 +273,7 @@ void Voxelization::renderVoxelVisualisation( const auto drawcall = vkcv::DrawcallInfo( vkcv::Mesh({}, nullptr, voxelCount), - { vkcv::DescriptorSetUsage(0, m_corePtr->getDescriptorSet(m_visualisationDescriptorSet).vulkanHandle) }); + { vkcv::DescriptorSetUsage(0, m_corePtr->getDescriptorSet(m_visualisationDescriptorSet).vulkanHandle) },1); m_corePtr->recordDrawcallsToCmdStream( cmdStream, diff --git a/projects/voxelization/src/main.cpp b/projects/voxelization/src/main.cpp index bab5d0f07271cf737cdc0334634e155cfbded179..68cb86b7d16dd443643b04e0dda09eaf20030404 100644 --- a/projects/voxelization/src/main.cpp +++ b/projects/voxelization/src/main.cpp @@ -302,8 +302,8 @@ int main(int argc, const char** argv) { drawcalls.push_back(vkcv::DrawcallInfo(meshes[i], { vkcv::DescriptorSetUsage(0, core.getDescriptorSet(forwardShadingDescriptorSet).vulkanHandle), - vkcv::DescriptorSetUsage(1, core.getDescriptorSet(perMeshDescriptorSets[i]).vulkanHandle) })); - shadowDrawcalls.push_back(vkcv::DrawcallInfo(meshes[i], {})); + vkcv::DescriptorSetUsage(1, core.getDescriptorSet(perMeshDescriptorSets[i]).vulkanHandle) },1)); + shadowDrawcalls.push_back(vkcv::DrawcallInfo(meshes[i], {},1)); } Voxelization::Dependencies voxelDependencies;