6 files changed, 12 insertions, 18 deletions
diff --git a/advanced_opengl/7.uniform_buffer/shaders/color_cube.fs b/advanced_opengl/7.uniform_buffer/shaders/color_cube.frag
index fbbafbf..d40d866 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/color_cube.fs
+++ b/advanced_opengl/7.uniform_buffer/shaders/color_cube.frag
@@ -2,8 +2,7 @@
 
 out vec4 frag_color;
 
-void
-main(void)
+void main(void)
 {
     frag_color = vec4(1.0, 0.0, 0.0, 1.0);
 }
diff --git a/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs b/advanced_opengl/7.uniform_buffer/shaders/color_cube.vert
index 17a3448..67226f8 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs
+++ b/advanced_opengl/7.uniform_buffer/shaders/color_cube.vert
@@ -3,14 +3,13 @@ layout(location = 0) in vec3 apos;
 
 layout(std140) uniform Matrices
 {
-    mat4 projection;
+    mat4 proj;
     mat4 view;
 };
 
 uniform mat4 model;
 
-void
-main(void)
+void main(void)
 {
-    gl_Position = projection*view*model*vec4(apos, 1.0);
+    gl_Position = proj*view*model*vec4(apos, 1.0);
 }
diff --git a/advanced_opengl/7.uniform_buffer/shaders/cube.fs b/advanced_opengl/7.uniform_buffer/shaders/cube.frag
index f58c5d3..71892a7 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/cube.fs
+++ b/advanced_opengl/7.uniform_buffer/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/7.uniform_buffer/shaders/cube.vs b/advanced_opengl/7.uniform_buffer/shaders/cube.vert
index 054164d..ec90f37 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/cube.vs
+++ b/advanced_opengl/7.uniform_buffer/shaders/cube.vert
@@ -5,7 +5,7 @@ layout(location = 1) in vec2 atex_coords;
 
 layout(std140) uniform Matrices
 {
-    uniform mat4 projection;
+    uniform mat4 proj;
     uniform mat4 view;
 };
 
@@ -13,9 +13,8 @@ uniform mat4 model;
 
 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/7.uniform_buffer/shaders/skybox.fs b/advanced_opengl/7.uniform_buffer/shaders/skybox.frag
index bf69c8b..22be301 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/skybox.fs
+++ b/advanced_opengl/7.uniform_buffer/shaders/skybox.frag
@@ -6,8 +6,7 @@ out vec4 frag_color;
 
 uniform samplerCube skybox;
 
-void
-main(void)
+void main(void)
 {
     frag_color = texture(skybox, tex_coords);
 }
diff --git a/advanced_opengl/7.uniform_buffer/shaders/skybox.vs b/advanced_opengl/7.uniform_buffer/shaders/skybox.vert
index 03b2171..ddbeb21 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/skybox.vs
+++ b/advanced_opengl/7.uniform_buffer/shaders/skybox.vert
@@ -6,14 +6,13 @@ out vec3 tex_coords;
 
 layout(std140) uniform Matrices
 {
-    uniform mat4 projection;
+    uniform mat4 proj;
     uniform mat4 view;
 };
 
-void
-main(void)
+void main(void)
 {
     tex_coords = apos;
-    vec4 pos = projection*view*vec4(apos, 1.0);
+    vec4 pos = proj*view*vec4(apos, 1.0);
     gl_Position = pos.xyww;
 }