From 79fde06ee45ba7df32d2706528b1ac7674bf7212 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Fri, 19 Jul 2024 15:07:35 +0200
Subject: [PATCH] Fix some long term todos
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
projects/mesh_shader/assets/shaders/shader.task | 3 +--
projects/mesh_shader/src/main.cpp | 6 ++----
src/vkcv/Core.cpp | 4 ++--
src/vkcv/ImageManager.cpp | 4 ++--
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/projects/mesh_shader/assets/shaders/shader.task b/projects/mesh_shader/assets/shaders/shader.task
index 5a104fd9..58698733 100644
--- a/projects/mesh_shader/assets/shaders/shader.task
+++ b/projects/mesh_shader/assets/shaders/shader.task
@@ -14,8 +14,7 @@ layout( push_constant ) uniform constants {
uint matrixIndex;
};
-// TODO: reuse mesh stage binding at location 2 after required fix in framework
-layout(std430, set=0, binding = 5) readonly buffer meshletBuffer {
+layout(std430, set=0, binding = 2) readonly buffer meshletBuffer {
Meshlet meshlets[];
};
diff --git a/projects/mesh_shader/src/main.cpp b/projects/mesh_shader/src/main.cpp
index 72b15e31..c248ac1c 100644
--- a/projects/mesh_shader/src/main.cpp
+++ b/projects/mesh_shader/src/main.cpp
@@ -302,15 +302,13 @@ int main(int argc, const char** argv) {
2, meshletBuffer.getHandle()
).writeStorageBuffer(
4, matrixBuffer.getHandle()
- ).writeStorageBuffer(
- 5, meshletBuffer.getHandle()
);
meshShaderWrites.writeUniformBuffer(3, cameraPlaneBuffer.getHandle());
- core.writeDescriptorSet( meshShaderDescriptorSet, meshShaderWrites);
+ core.writeDescriptorSet( meshShaderDescriptorSet, meshShaderWrites);
- vkcv::ImageHandle depthBuffer;
+ vkcv::ImageHandle depthBuffer;
vkcv::ImageHandle swapchainImageHandle = vkcv::ImageHandle::createSwapchainImageHandle();
vkcv::VertexData vertexData (vertexBufferBindings);
diff --git a/src/vkcv/Core.cpp b/src/vkcv/Core.cpp
index 5213c572..3cefdab8 100644
--- a/src/vkcv/Core.cpp
+++ b/src/vkcv/Core.cpp
@@ -316,8 +316,8 @@ namespace vkcv {
static std::array<uint32_t, 2>
getWidthHeightFromRenderTargets(const Vector<ImageHandle> &renderTargets,
- const vk::Extent2D &swapchainExtent,
- const ImageManager &imageManager) {
+ const vk::Extent2D &swapchainExtent,
+ const ImageManager &imageManager) {
std::array<uint32_t, 2> widthHeight;
diff --git a/src/vkcv/ImageManager.cpp b/src/vkcv/ImageManager.cpp
index 619f1658..79e18ade 100644
--- a/src/vkcv/ImageManager.cpp
+++ b/src/vkcv/ImageManager.cpp
@@ -516,7 +516,7 @@ namespace vkcv {
}
void ImageManager::switchImageLayoutImmediate(const ImageHandle &handle,
- vk::ImageLayout newLayout) {
+ vk::ImageLayout newLayout) {
auto &image = (*this) [handle];
const auto transitionBarriers = createImageLayoutTransitionBarriers(image, 0, 0, newLayout, false);
@@ -540,7 +540,7 @@ namespace vkcv {
);
if (vk::Result::eSuccess != result) {
- // TODO: warning?
+ vkcv_log(LogLevel::WARNING, "Transition to new layout failed");
break;
}
}
--
GitLab