Remove GL_ARB_separate_shader_objects and gl_PerVertex references since they are no longer/not required (fixes #112)

Overv · Overv · commit ee1de45d7940 · 2018-11-19T22:44:21.000+01:00
diff --git a/03_Drawing_a_triangle/02_Graphics_pipeline_basics/01_Shader_modules.md b/03_Drawing_a_triangle/02_Graphics_pipeline_basics/01_Shader_modules.md
@@ -87,11 +87,6 @@ code looks like this:
 
 ```glsl
 #version 450
-#extension GL_ARB_separate_shader_objects : enable
-
-out gl_PerVertex {
-    vec4 gl_Position;
-};
 
 vec2 positions[3] = vec2[](
     vec2(0.0, -0.5),
@@ -110,8 +105,7 @@ the vertex buffer, but in our case it will be an index into a hardcoded array
 of vertex data. The position of each vertex is accessed from the constant array
 in the shader and combined with dummy `z` and `w` components to produce a
 position in clip coordinates. The built-in variable `gl_Position` functions as
-the output. The `GL_ARB_separate_shader_objects` extension is required for
-Vulkan shaders to work.
+the output.
 
 ## Fragment shader
 
@@ -204,10 +198,6 @@ The contents of `shader.vert` should be:
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
 
-out gl_PerVertex {
-    vec4 gl_Position;
-};
-
 layout(location = 0) out vec3 fragColor;
 
 vec2 positions[3] = vec2[](
diff --git a/04_Vertex_buffers/00_Vertex_input_description.md b/04_Vertex_buffers/00_Vertex_input_description.md
@@ -21,10 +21,6 @@ layout(location = 1) in vec3 inColor;
 
 layout(location = 0) out vec3 fragColor;
 
-out gl_PerVertex {
-    vec4 gl_Position;
-};
-
 void main() {
     gl_Position = vec4(inPosition, 0.0, 1.0);
     fragColor = inColor;
diff --git a/05_Uniform_buffers/00_Descriptor_layout_and_buffer.md b/05_Uniform_buffers/00_Descriptor_layout_and_buffer.md
@@ -79,10 +79,6 @@ layout(location = 1) in vec3 inColor;
 
 layout(location = 0) out vec3 fragColor;
 
-out gl_PerVertex {
-    vec4 gl_Position;
-};
-
 void main() {
     gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 0.0, 1.0);
     fragColor = inColor;
diff --git a/code/09_shader_base.vert b/code/09_shader_base.vert
@@ -1,10 +1,6 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
 
-out gl_PerVertex {
-    vec4 gl_Position;
-};
-
 layout(location = 0) out vec3 fragColor;
 
 vec2 positions[3] = vec2[](
@@ -22,4 +18,4 @@ vec3 colors[3] = vec3[](
 void main() {
     gl_Position = vec4(positions[gl_VertexIndex], 0.0, 1.0);
     fragColor = colors[gl_VertexIndex];
-}
+}
diff --git a/code/17_shader_vertexbuffer.vert b/code/17_shader_vertexbuffer.vert
@@ -6,11 +6,7 @@ layout(location = 1) in vec3 inColor;
 
 layout(location = 0) out vec3 fragColor;
 
-out gl_PerVertex {
-    vec4 gl_Position;
-};
-
 void main() {
     gl_Position = vec4(inPosition, 0.0, 1.0);
     fragColor = inColor;
-}
+}
diff --git a/code/21_shader_ubo.vert b/code/21_shader_ubo.vert
@@ -12,11 +12,7 @@ layout(location = 1) in vec3 inColor;
 
 layout(location = 0) out vec3 fragColor;
 
-out gl_PerVertex {
-    vec4 gl_Position;
-};
-
 void main() {
     gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 0.0, 1.0);
     fragColor = inColor;
-}
+}
diff --git a/code/25_shader_textures.vert b/code/25_shader_textures.vert
@@ -14,12 +14,8 @@ layout(location = 2) in vec2 inTexCoord;
 layout(location = 0) out vec3 fragColor;
 layout(location = 1) out vec2 fragTexCoord;
 
-out gl_PerVertex {
-    vec4 gl_Position;
-};
-
 void main() {
     gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 0.0, 1.0);
     fragColor = inColor;
     fragTexCoord = inTexCoord;
-}
+}
diff --git a/code/26_shader_depth.vert b/code/26_shader_depth.vert
@@ -14,12 +14,8 @@ layout(location = 2) in vec2 inTexCoord;
 layout(location = 0) out vec3 fragColor;
 layout(location = 1) out vec2 fragTexCoord;
 
-out gl_PerVertex {
-    vec4 gl_Position;
-};
-
 void main() {
     gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
     fragColor = inColor;
     fragTexCoord = inTexCoord;
-}
+}
