8 files changed, 13 insertions, 21 deletions
diff --git a/advanced_opengl/9.instancing/shaders/default.fs b/advanced_opengl/9.instancing/shaders/default.frag
index c655ac8..8ae5c3b 100644
--- a/advanced_opengl/9.instancing/shaders/default.fs
+++ b/advanced_opengl/9.instancing/shaders/default.frag
@@ -6,8 +6,7 @@ out vec4 frag_color;
 
 uniform sampler2D texture0;
 
-void
-main(void)
+void main(void)
 {
     frag_color = texture(texture0, tex_coords);
-}
-\ No newline at end of file
+}
diff --git a/advanced_opengl/9.instancing/shaders/default.vs b/advanced_opengl/9.instancing/shaders/default.vert
index 85d3c19..87cb538 100644
--- a/advanced_opengl/9.instancing/shaders/default.vs
+++ b/advanced_opengl/9.instancing/shaders/default.vert
@@ -6,13 +6,12 @@ layout(location = 2) in vec2 atex_coords;
 out vec3 normal;
 out vec2 tex_coords;
 
-uniform mat4 projection;
+uniform mat4 proj;
 uniform mat4 view;
 uniform mat4 model;
 
-void
-main(void)
+void main(void)
 {
     tex_coords = atex_coords;
-    gl_Position = projection*view*model*vec4(apos, 1.0);
+    gl_Position = proj*view*model*vec4(apos, 1.0);
 }
diff --git a/advanced_opengl/9.instancing/shaders/instanced_arrays.fs b/advanced_opengl/9.instancing/shaders/instanced_arrays.frag
index a32e52e..4865933 100644
--- a/advanced_opengl/9.instancing/shaders/instanced_arrays.fs
+++ b/advanced_opengl/9.instancing/shaders/instanced_arrays.frag
@@ -4,8 +4,7 @@ in vec3 color;
 
 out vec4 frag_color;
 
-void
-main(void)
+void main(void)
 {
     frag_color = vec4(color, 1.0);
 }
diff --git a/advanced_opengl/9.instancing/shaders/instanced_arrays.vs b/advanced_opengl/9.instancing/shaders/instanced_arrays.vert
index 4ea0fe4..ce3ea7d 100644
--- a/advanced_opengl/9.instancing/shaders/instanced_arrays.vs
+++ b/advanced_opengl/9.instancing/shaders/instanced_arrays.vert
@@ -5,8 +5,7 @@ layout(location = 2) in vec2 aoffset;
 
 out vec3 color;
 
-void
-main(void)
+void main(void)
 {
     color = acolor;
     vec2 pos = apos*(gl_InstanceID/100.0);
diff --git a/advanced_opengl/9.instancing/shaders/instanced_mat4.fs b/advanced_opengl/9.instancing/shaders/instanced_mat4.frag
index ae625b2..3b96d36 100644
--- a/advanced_opengl/9.instancing/shaders/instanced_mat4.fs
+++ b/advanced_opengl/9.instancing/shaders/instanced_mat4.frag
@@ -6,8 +6,7 @@ out vec4 frag_color;
 
 uniform sampler2D texture1;
 
-void
-main(void)
+void main(void)
 {
     frag_color = texture(texture1, tex_coords);
 }
diff --git a/advanced_opengl/9.instancing/shaders/instanced_mat4.vs b/advanced_opengl/9.instancing/shaders/instanced_mat4.vert
index c65be90..835cc5d 100644
--- a/advanced_opengl/9.instancing/shaders/instanced_mat4.vs
+++ b/advanced_opengl/9.instancing/shaders/instanced_mat4.vert
@@ -5,12 +5,11 @@ layout(location = 3) in mat4 instance_matrix;
 
 out vec2 tex_coords;
 
-uniform mat4 projection;
+uniform mat4 proj;
 uniform mat4 view;
 
-void
-main(void)
+void main(void)
 {
     tex_coords = atex_coords;
-    gl_Position = projection*view*instance_matrix*vec4(apos, 1.0);
+    gl_Position = proj*view*instance_matrix*vec4(apos, 1.0);
 }
diff --git a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.fs b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.frag
index a32e52e..4865933 100644
--- a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.fs
+++ b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.frag
@@ -4,8 +4,7 @@ in vec3 color;
 
 out vec4 frag_color;
 
-void
-main(void)
+void main(void)
 {
     frag_color = vec4(color, 1.0);
 }
diff --git a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vs b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vert
index a77be31..61b07a0 100644
--- a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vs
+++ b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vert
@@ -6,8 +6,7 @@ out vec3 color;
 
 uniform vec2 offsets[100];
 
-void
-main(void)
+void main(void)
 {
     color = acolor;
     gl_Position = vec4(apos+offsets[gl_InstanceID], 0.0, 1.0);