From 1fa2bb27945c910cc4d348008d5699fbe5f0ec9f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 9 Sep 2025 09:55:11 +0100 Subject: [PATCH 1/2] Changed the viewDir location to avoid overlaping with texCoord array --- data/shaders/standard.vert | 2 +- data/shaders/standard_pbr.frag | 2 +- data/shaders/standard_phong.frag | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/shaders/standard.vert b/data/shaders/standard.vert index 17c23e0b..eba461dd 100644 --- a/data/shaders/standard.vert +++ b/data/shaders/standard.vert @@ -79,7 +79,7 @@ layout(location = 0) out vec3 eyePos; layout(location = 1) out vec3 normalDir; layout(location = 2) out vec4 vertexColor; layout(location = 3) out vec2 texCoord[VSG_TEXCOORD_COUNT]; -layout(location = 6) out vec3 viewDir; +layout(location = 7) out vec3 viewDir; out gl_PerVertex{ vec4 gl_Position; diff --git a/data/shaders/standard_pbr.frag b/data/shaders/standard_pbr.frag index 2de06454..9a09c6e9 100644 --- a/data/shaders/standard_pbr.frag +++ b/data/shaders/standard_pbr.frag @@ -87,7 +87,7 @@ layout(location = 0) in vec3 eyePos; layout(location = 1) in vec3 normalDir; layout(location = 2) in vec4 vertexColor; layout(location = 3) in vec2 texCoord[VSG_TEXCOORD_COUNT]; -layout(location = 6) in vec3 viewDir; +layout(location = 7) in vec3 viewDir; layout(location = 0) out vec4 outColor; diff --git a/data/shaders/standard_phong.frag b/data/shaders/standard_phong.frag index 43c4e8de..c6aec30a 100644 --- a/data/shaders/standard_phong.frag +++ b/data/shaders/standard_phong.frag @@ -77,7 +77,7 @@ layout(location = 0) in vec3 eyePos; layout(location = 1) in vec3 normalDir; layout(location = 2) in vec4 vertexColor; layout(location = 3) in vec2 texCoord[VSG_TEXCOORD_COUNT]; -layout(location = 6) in vec3 viewDir; +layout(location = 7) in vec3 viewDir; layout(location = 0) out vec4 outColor; From 1a535327249fe4ebe50491ee180934ae8523eec7 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 9 Sep 2025 18:56:27 +0100 Subject: [PATCH 2/2] Changed location of viewDir and texCoord[] to avoid location overlaps. --- data/shaders/standard.vert | 4 ++-- data/shaders/standard_flat_shaded.frag | 2 +- data/shaders/standard_pbr.frag | 4 ++-- data/shaders/standard_phong.frag | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/shaders/standard.vert b/data/shaders/standard.vert index eba461dd..0cde068f 100644 --- a/data/shaders/standard.vert +++ b/data/shaders/standard.vert @@ -78,8 +78,8 @@ layout(set = MATERIAL_DESCRIPTOR_SET, binding = 12) readonly buffer JointMatrice layout(location = 0) out vec3 eyePos; layout(location = 1) out vec3 normalDir; layout(location = 2) out vec4 vertexColor; -layout(location = 3) out vec2 texCoord[VSG_TEXCOORD_COUNT]; -layout(location = 7) out vec3 viewDir; +layout(location = 3) out vec3 viewDir; +layout(location = 4) out vec2 texCoord[VSG_TEXCOORD_COUNT]; out gl_PerVertex{ vec4 gl_Position; diff --git a/data/shaders/standard_flat_shaded.frag b/data/shaders/standard_flat_shaded.frag index e15c5fd3..13e9f34b 100644 --- a/data/shaders/standard_flat_shaded.frag +++ b/data/shaders/standard_flat_shaded.frag @@ -47,7 +47,7 @@ layout(set = MATERIAL_DESCRIPTOR_SET, binding = 11) uniform TexCoordIndices } texCoordIndices; layout(location = 2) in vec4 vertexColor; -layout(location = 3) in vec2 texCoord[VSG_TEXCOORD_COUNT]; +layout(location = 4) in vec2 texCoord[VSG_TEXCOORD_COUNT]; layout(location = 0) out vec4 outColor; diff --git a/data/shaders/standard_pbr.frag b/data/shaders/standard_pbr.frag index 9a09c6e9..3b4b1d11 100644 --- a/data/shaders/standard_pbr.frag +++ b/data/shaders/standard_pbr.frag @@ -86,8 +86,8 @@ layout(set = VIEW_DESCRIPTOR_SET, binding = 0) uniform LightData layout(location = 0) in vec3 eyePos; layout(location = 1) in vec3 normalDir; layout(location = 2) in vec4 vertexColor; -layout(location = 3) in vec2 texCoord[VSG_TEXCOORD_COUNT]; -layout(location = 7) in vec3 viewDir; +layout(location = 3) in vec3 viewDir; +layout(location = 4) in vec2 texCoord[VSG_TEXCOORD_COUNT]; layout(location = 0) out vec4 outColor; diff --git a/data/shaders/standard_phong.frag b/data/shaders/standard_phong.frag index c6aec30a..4be2bdd2 100644 --- a/data/shaders/standard_phong.frag +++ b/data/shaders/standard_phong.frag @@ -76,8 +76,8 @@ layout(set = VIEW_DESCRIPTOR_SET, binding = 0) uniform LightData layout(location = 0) in vec3 eyePos; layout(location = 1) in vec3 normalDir; layout(location = 2) in vec4 vertexColor; -layout(location = 3) in vec2 texCoord[VSG_TEXCOORD_COUNT]; -layout(location = 7) in vec3 viewDir; +layout(location = 3) in vec3 viewDir; +layout(location = 4) in vec2 texCoord[VSG_TEXCOORD_COUNT]; layout(location = 0) out vec4 outColor;