From c01f6eb9c32052dd865ac19be02f52b07c3e4fe4 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Sun, 30 May 2021 14:01:43 +0200
Subject: [PATCH] [#52] Fixed triangle project to compile
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
projects/first_triangle/src/main.cpp | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/projects/first_triangle/src/main.cpp b/projects/first_triangle/src/main.cpp
index 8fcbf76f..a7153156 100644
--- a/projects/first_triangle/src/main.cpp
+++ b/projects/first_triangle/src/main.cpp
@@ -94,7 +94,7 @@ int main(int argc, const char** argv) {
triangleShaderProgram.reflectShader(vkcv::ShaderStage::VERTEX);
triangleShaderProgram.reflectShader(vkcv::ShaderStage::FRAGMENT);
- const vkcv::PipelineConfig trianglePipelineDefinition(triangleShaderProgram, windowWidth, windowHeight, trianglePass);
+ const vkcv::PipelineConfig trianglePipelineDefinition(triangleShaderProgram, windowWidth, windowHeight, trianglePass, {});
vkcv::PipelineHandle trianglePipeline = core.createGraphicsPipeline(trianglePipelineDefinition);
if (!trianglePipeline)
@@ -120,6 +120,8 @@ int main(int argc, const char** argv) {
auto resourceHandle = core.createResourceDescription(sets);
std::cout << "Resource " << resourceHandle << " created." << std::endl;
}
+
+ std::vector<vkcv::VertexBufferBinding> vertexBufferBindings;
/*
* BufferHandle triangleVertices = core.createBuffer(vertices);
@@ -147,7 +149,18 @@ int main(int argc, const char** argv) {
cameraManager.getCamera().updateView(std::chrono::duration<double>(deltatime).count());
const glm::mat4 mvp = cameraManager.getCamera().getProjection() * cameraManager.getCamera().getView();
- core.renderMesh(trianglePass, trianglePipeline, windowWidth, windowHeight, sizeof(mvp), &mvp, testBuffer.getHandle(), triangleIndexBuffer.getHandle(), 3);
+ core.renderMesh(
+ trianglePass,
+ trianglePipeline,
+ windowWidth,
+ windowHeight,
+ sizeof(mvp),
+ &mvp,
+ vertexBufferBindings,
+ triangleIndexBuffer.getHandle(),
+ 3
+ );
+
core.endFrame();
}
return 0;
--
GitLab