From 285f20091650f121af75152acd2228acc75d60d0 Mon Sep 17 00:00:00 2001
From: Sebastian Gaida <sebastian-gaida@gmx.de>
Date: Fri, 3 Sep 2021 15:40:17 +0200
Subject: [PATCH] [#89] fix projects
---
projects/first_scene/src/main.cpp | 2 +-
projects/mesh_shader/src/main.cpp | 2 +-
projects/particle_simulation/src/main.cpp | 4 ++--
projects/voxelization/src/main.cpp | 5 ++++-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/projects/first_scene/src/main.cpp b/projects/first_scene/src/main.cpp
index 17ac917a..cf238375 100644
--- a/projects/first_scene/src/main.cpp
+++ b/projects/first_scene/src/main.cpp
@@ -93,7 +93,7 @@ int main(int argc, const char** argv) {
return EXIT_FAILURE;
}
- auto swapchainExtent = core.getSwapchain().getExtent();
+ auto swapchainExtent = core.getSwapchain(windowHandle).getExtent();
vkcv::ImageHandle depthBuffer = core.createImage(
vk::Format::eD32Sfloat,
diff --git a/projects/mesh_shader/src/main.cpp b/projects/mesh_shader/src/main.cpp
index bbfe16ac..0bd27913 100644
--- a/projects/mesh_shader/src/main.cpp
+++ b/projects/mesh_shader/src/main.cpp
@@ -203,7 +203,7 @@ int main(int argc, const char** argv) {
vkcv::DescriptorSetLayoutHandle vertexShaderDescriptorSetLayout = core.createDescriptorSetLayout(bunnyShaderProgram.getReflectedDescriptors().at(0));
vkcv::DescriptorSetHandle vertexShaderDescriptorSet = core.createDescriptorSet(vertexShaderDescriptorSetLayout);
- auto swapchainExtent = core.getSwapchain().getExtent();
+ auto swapchainExtent = core.getSwapchain(windowHandle).getExtent();
const vkcv::PipelineConfig bunnyPipelineDefinition {
bunnyShaderProgram,
diff --git a/projects/particle_simulation/src/main.cpp b/projects/particle_simulation/src/main.cpp
index 4171c73a..afb1c177 100644
--- a/projects/particle_simulation/src/main.cpp
+++ b/projects/particle_simulation/src/main.cpp
@@ -209,7 +209,7 @@ int main(int argc, const char **argv) {
cameraManager.getCamera(camIndex1).setPosition(glm::vec3(0.0f, 0.0f, -2.0f));
cameraManager.getCamera(camIndex1).setCenter(glm::vec3(0.0f, 0.0f, 0.0f));
- auto swapchainExtent = core.getSwapchain().getExtent();
+ auto swapchainExtent = core.getSwapchain(windowHandle).getExtent();
vkcv::ImageHandle colorBuffer = core.createImage(
colorFormat,
@@ -219,7 +219,7 @@ int main(int argc, const char **argv) {
).getHandle();
BloomAndFlares bloomAndFlares(&core, colorFormat, swapchainExtent.width, swapchainExtent.height);
window.e_resize.add([&](int width, int height) {
- swapchainExtent = core.getSwapchain().getExtent();
+ swapchainExtent = core.getSwapchain(windowHandle).getExtent();
colorBuffer = core.createImage(
colorFormat,
swapchainExtent.width,
diff --git a/projects/voxelization/src/main.cpp b/projects/voxelization/src/main.cpp
index 3b3e60a1..1411e327 100644
--- a/projects/voxelization/src/main.cpp
+++ b/projects/voxelization/src/main.cpp
@@ -23,6 +23,9 @@ int main(int argc, const char** argv) {
features.requireExtension(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME);
features.requireExtension(VK_KHR_16BIT_STORAGE_EXTENSION_NAME);
+ const uint32_t windowWidth = 1280;
+ const uint32_t windowHeight = 720;
+
vkcv::Core core = vkcv::Core::create(
applicationName,
VK_MAKE_VERSION(0, 0, 1),
@@ -295,7 +298,7 @@ int main(int argc, const char** argv) {
vkcv::DescriptorSetLayoutHandle prepassDescriptorSetLayout = core.createDescriptorSetLayout({});
vkcv::DescriptorSetHandle prepassDescriptorSet = core.createDescriptorSet(prepassDescriptorSetLayout);
- auto swapchainExtent = core.getSwapchain().getExtent();
+ auto swapchainExtent = core.getSwapchain(windowHandle).getExtent();
vkcv::PipelineConfig prepassPipelineConfig{
depthPrepassShader,
--
GitLab