From 03c441faaf390c732225223bde84cbddf11dfecf Mon Sep 17 00:00:00 2001
From: Alexander Gauggel <agauggel@uni-koblenz.de>
Date: Sat, 3 Jul 2021 16:40:53 +0200
Subject: [PATCH] [#87] Fix shader validation layer warning
---
.../mesh_shader/resources/shaders/shader.frag | 11 ++--------
.../mesh_shader/resources/shaders/shader.mesh | 20 ++++---------------
2 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/projects/mesh_shader/resources/shaders/shader.frag b/projects/mesh_shader/resources/shaders/shader.frag
index 67075c6f..37a98da8 100644
--- a/projects/mesh_shader/resources/shaders/shader.frag
+++ b/projects/mesh_shader/resources/shaders/shader.frag
@@ -1,16 +1,9 @@
#version 450
#extension GL_ARB_separate_shader_objects : enable
-//layout(location = 0) in vec3 fragColor;
+layout(location = 0) in vec3 VertexColor;
layout(location = 0) out vec4 outColor;
-struct VertColor
-{
- vec3 color;
-};
-
-layout(location = 0) in VertColor VertexInput;
-
void main() {
- outColor = vec4(VertexInput.color, 1);
+ outColor = vec4(VertexColor, 1);
}
\ No newline at end of file
diff --git a/projects/mesh_shader/resources/shaders/shader.mesh b/projects/mesh_shader/resources/shaders/shader.mesh
index c21cf209..7e78cced 100644
--- a/projects/mesh_shader/resources/shaders/shader.mesh
+++ b/projects/mesh_shader/resources/shaders/shader.mesh
@@ -11,19 +11,7 @@ layout( push_constant ) uniform constants{
mat4 mvp;
};
-// out uint gl_PrimitiveCountNV;
-// out uint gl_PrimitiveIndicesNV[];
-
-//out gl_MeshPerVertexNV {
-// vec4 gl_Position;
-//} gl_MeshVerticesNV[];
-
-struct VertColor
-{
- vec3 color;
-};
-
-layout(location = 0) out VertColor VertexOutputs[];
+layout(location = 0) out vec3 vertexColors[];
void main() {
if(gl_LocalInvocationID.x == 0)
@@ -37,8 +25,8 @@ void main() {
gl_MeshVerticesNV[1].gl_Position = mvp * vec4( 0.5, 0.5, 0.5, 1);
gl_MeshVerticesNV[2].gl_Position = mvp * vec4( 0 , -0.5, 0.5, 1);
- VertexOutputs[0].color = vec3(1, 0, 0);
- VertexOutputs[1].color = vec3(0, 1, 0);
- VertexOutputs[2].color = vec3(0, 0, 1);
+ vertexColors[0] = vec3(1, 0, 0);
+ vertexColors[1] = vec3(0, 1, 0);
+ vertexColors[2] = vec3(0, 0, 1);
}
}
\ No newline at end of file
--
GitLab