From 17dc802c3da306ec57c8d8f42210f4ff7df7426a Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Mon, 10 Oct 2022 18:29:22 +0200
Subject: [PATCH] Adjust unused descriptor set binding
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
demos/NormalMapping/shaders/NormalMapping.vert | 13 -------------
demos/NormalMapping/src/main.cpp | 4 +---
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/demos/NormalMapping/shaders/NormalMapping.vert b/demos/NormalMapping/shaders/NormalMapping.vert
index f83070f..62e2fa3 100644
--- a/demos/NormalMapping/shaders/NormalMapping.vert
+++ b/demos/NormalMapping/shaders/NormalMapping.vert
@@ -11,19 +11,6 @@ layout(set=0, binding=0) uniform matrixBuffer {
mat4 projectionMatrix;
};
-struct Light {
- vec4 pos; // pos.w = 0 (dir light), pos.w = 1 (point light)
- vec3 col;
- float spot_exponent;
- vec3 spot_direction;
- float spot_cutoff; // no spotlight if cutoff = 0
-};
-
-layout(set=0, binding=2) uniform lightBuffer {
- Light light;
- vec3 lightAmbient;
-};
-
layout(location = 0) out vec3 passPosition;
layout(location = 1) out vec3 passNormal;
layout(location = 2) out vec3 passTangent;
diff --git a/demos/NormalMapping/src/main.cpp b/demos/NormalMapping/src/main.cpp
index 3af12d6..da6fe0c 100644
--- a/demos/NormalMapping/src/main.cpp
+++ b/demos/NormalMapping/src/main.cpp
@@ -109,12 +109,10 @@ int main(int argc, const char** argv) {
vkcv::createVertexBindings(normalMappingShaderProgram.getVertexAttachments())
};
- vkcv::DescriptorBindings descriptorBindings0 = (
+ const vkcv::DescriptorBindings descriptorBindings0 = (
phongShaderProgram.getReflectedDescriptors().at(0)
);
- descriptorBindings0.at(2).shaderStages |= vkcv::ShaderStage::VERTEX;
-
auto descriptorSetLayout0 = core.createDescriptorSetLayout(descriptorBindings0);
auto descriptorSet0 = core.createDescriptorSet(descriptorSetLayout0);
--
GitLab