From 5027e83781fb4151c7ab6f594c450595a66a7889 Mon Sep 17 00:00:00 2001
From: Alexander Gauggel <agauggel@uni-koblenz.de>
Date: Thu, 10 Jun 2021 18:30:57 +0200
Subject: [PATCH] [#36] Use shader reflection in cmd_sync_test main.cpp
---
projects/cmd_sync_test/src/main.cpp | 9 ++-------
projects/first_mesh/src/main.cpp | 3 +--
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/projects/cmd_sync_test/src/main.cpp b/projects/cmd_sync_test/src/main.cpp
index c1d11370..3886a53d 100644
--- a/projects/cmd_sync_test/src/main.cpp
+++ b/projects/cmd_sync_test/src/main.cpp
@@ -102,13 +102,8 @@ int main(int argc, const char** argv) {
triangleShaderProgram.addShader(vkcv::ShaderStage::FRAGMENT, std::filesystem::path("resources/shaders/frag.spv"));
triangleShaderProgram.reflectShader(vkcv::ShaderStage::VERTEX);
triangleShaderProgram.reflectShader(vkcv::ShaderStage::FRAGMENT);
-
- std::vector<vkcv::DescriptorBinding> descriptorBindings = {
- vkcv::DescriptorBinding(0, vkcv::DescriptorType::IMAGE_SAMPLED, 1, vkcv::ShaderStage::FRAGMENT),
- vkcv::DescriptorBinding(1, vkcv::DescriptorType::SAMPLER, 1, vkcv::ShaderStage::FRAGMENT),
- vkcv::DescriptorBinding(2, vkcv::DescriptorType::UNIFORM_BUFFER, 1, vkcv::ShaderStage::FRAGMENT),
- vkcv::DescriptorBinding(3, vkcv::DescriptorType::IMAGE_SAMPLED, 1, vkcv::ShaderStage::FRAGMENT) ,
- vkcv::DescriptorBinding(4, vkcv::DescriptorType::SAMPLER, 1, vkcv::ShaderStage::FRAGMENT) };
+
+ std::vector<vkcv::DescriptorBinding> descriptorBindings = { triangleShaderProgram.getReflectedDescriptors()[0] };
vkcv::DescriptorSetHandle descriptorSet = core.createDescriptorSet(descriptorBindings);
const vkcv::PipelineConfig trianglePipelineDefinition(
diff --git a/projects/first_mesh/src/main.cpp b/projects/first_mesh/src/main.cpp
index 55f70034..00a77c76 100644
--- a/projects/first_mesh/src/main.cpp
+++ b/projects/first_mesh/src/main.cpp
@@ -95,8 +95,7 @@ int main(int argc, const char** argv) {
});
uint32_t setID = 0;
- std::vector<vkcv::DescriptorBinding> descriptorBindings = {
- triangleShaderProgram.getReflectedDescriptors()[setID] };
+ std::vector<vkcv::DescriptorBinding> descriptorBindings = { triangleShaderProgram.getReflectedDescriptors()[setID] };
vkcv::DescriptorSetHandle descriptorSet = core.createDescriptorSet(descriptorBindings);
const vkcv::PipelineConfig trianglePipelineDefinition(
--
GitLab