Use shaders with include section to show off ShaderParser

deccer · Nov 23, 2022 · 20fdf67 · 20fdf67
1 parent de04fed
commit 20fdf67
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/examples/Swapchain/Swapchain.Assets/Shaders/Common.glsl b/examples/Swapchain/Swapchain.Assets/Shaders/Common.glsl
@@ -0,0 +1,14 @@
+layout(binding = 0, std140) uniform GpuConstants
+{
+    mat4 ViewProj;
+};
+
+struct GpuObject
+{
+    mat4 World;
+};
+
+layout(binding = 1, std430) readonly buffer ObjectBuffer
+{
+    GpuObject Objects[];
+} objectBuffer;
diff --git a/examples/Swapchain/Swapchain.Assets/Shaders/FST.vs.glsl b/examples/Swapchain/Swapchain.Assets/Shaders/FST.vs.glsl
@@ -1,6 +1,10 @@
 #version 460 core
 
-layout(location = 0) out vec2 fs_uv;
+layout (location = 0) out gl_PerVertex
+{
+    vec4 gl_Position;
+};
+layout(location = 1) out vec2 fs_uv;
 
 void main()
 {

diff --git a/examples/Swapchain/Swapchain.Assets/Shaders/Scene.vs.glsl b/examples/Swapchain/Swapchain.Assets/Shaders/Scene.vs.glsl
@@ -5,25 +5,16 @@ layout(location = 1) in vec3 i_normal;
 layout(location = 2) in vec2 i_uv;
 layout(location = 3) in vec2 i_tangent;
 
+layout (location = 0) out gl_PerVertex
+{
+    vec4 gl_Position;
+};
 layout(location = 0) out vec3 v_position;
 layout(location = 1) out vec3 v_normal;
 layout(location = 2) out vec2 v_uv;
 layout(location = 3) out flat int v_object_id;
 
-layout(binding = 0, std140) uniform GpuConstants
-{
-    mat4 ViewProj;
-};
-
-struct GpuObject
-{
-    mat4 World;
-};
-
-layout(binding = 1, std430) readonly buffer ObjectBuffer
-{
-    GpuObject Objects[];
-} objectBuffer;
+#include "Common.glsl"
 
 void main()
 {