4 files changed, 12 insertions, 25 deletions
diff --git a/advanced_opengl/5.framebuffers/shaders/cube.fs b/advanced_opengl/5.framebuffers/shaders/cube.frag
index f58c5d3..71892a7 100644
--- a/advanced_opengl/5.framebuffers/shaders/cube.fs
+++ b/advanced_opengl/5.framebuffers/shaders/cube.frag
@@ -6,8 +6,7 @@ in vec2 tex_coords;
 
 uniform sampler2D texture1;
 
-void
-main(void)
+void main(void)
 {
     frag_color = texture(texture1, tex_coords);
 }
diff --git a/advanced_opengl/5.framebuffers/shaders/cube.vs b/advanced_opengl/5.framebuffers/shaders/cube.vert
index aea5c2c..2436f35 100644
--- a/advanced_opengl/5.framebuffers/shaders/cube.vs
+++ b/advanced_opengl/5.framebuffers/shaders/cube.vert
@@ -5,13 +5,12 @@ layout(location = 1) in vec2 atex_coords;
 
 uniform mat4 model;
 uniform mat4 view;
-uniform mat4 projection;
+uniform mat4 proj;
 
 out vec2 tex_coords;
 
-void
-main(void)
+void main(void)
 {
-    gl_Position = projection*view*model*vec4(apos, 1.0);
+    gl_Position = proj*view*model*vec4(apos, 1.0);
     tex_coords = atex_coords;
 }
diff --git a/advanced_opengl/5.framebuffers/shaders/screen.fs b/advanced_opengl/5.framebuffers/shaders/screen.frag
index 183d490..234b3fc 100644
--- a/advanced_opengl/5.framebuffers/shaders/screen.fs
+++ b/advanced_opengl/5.framebuffers/shaders/screen.frag
@@ -6,15 +6,13 @@ in vec2 tex_coords;
 
 uniform sampler2D texture1;
 
-vec4
-inversion()
+vec4 inversion()
 {
     vec4 result = vec4(1.0-vec3(texture(texture1, tex_coords)), 1.0);
     return(result);
 }
 
-vec4
-grayscale_average()
+vec4 grayscale_average()
 {
     vec4 tex_color = texture(texture1, tex_coords);
     float average = (tex_color.r+tex_color.g+tex_color.b)/3.0;
@@ -22,8 +20,7 @@ grayscale_average()
     return(result);
 }
 
-vec4
-grayscale_weights()
+vec4 grayscale_weights()
 {
     vec4 tex_color = texture(texture1, tex_coords);
     float average = 0.2126*tex_color.r+0.7152*tex_color.g+0.0722*tex_color.b;
@@ -33,8 +30,7 @@ grayscale_weights()
 
 const float offset = 1.0/300.0;
 
-vec4
-kernel_effect(float[9] kernel)
+vec4 kernel_effect(float[9] kernel)
 {
     vec2 offsets[9] = vec2[](
         vec2(-offset, offset), /* top-left */
@@ -49,13 +45,8 @@ kernel_effect(float[9] kernel)
     );
 
     vec3 sample_texture[9];
-    for (int offset_index = 0;
-         offset_index < 9;
-         ++offset_index)
-    {
-        sample_texture[offset_index] =
-            vec3(texture(texture1, tex_coords+offsets[offset_index]));
-    }
+    for (int i = 0; i < 9; ++i)
+        sample_texture[i] = vec3(texture(texture1, tex_coords+offsets[i]));
 
     vec3 color = vec3(0.0);
     for (int i = 0; i < 9; ++i)
@@ -64,8 +55,7 @@ kernel_effect(float[9] kernel)
     return(vec4(color, 1.0));
 }
 
-void
-main(void)
+void main(void)
 {
     float strange_kernel[9] = float[](
         -1, -1, -1,
diff --git a/advanced_opengl/5.framebuffers/shaders/screen.vs b/advanced_opengl/5.framebuffers/shaders/screen.vert
index 8fdea55..92bc378 100644
--- a/advanced_opengl/5.framebuffers/shaders/screen.vs
+++ b/advanced_opengl/5.framebuffers/shaders/screen.vert
@@ -6,8 +6,7 @@ out vec2 tex_coords;
 
 uniform mat4 model;
 
-void
-main(void)
+void main(void)
 {
     gl_Position = model*vec4(apos, 1.0);
     tex_coords = atex_coords;