From 745ad721bd73030414e3346cfaa8bc24da2a93eb Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Mon, 24 Apr 2017 19:25:55 +0200 Subject: [PATCH 1/2] Update shader_s.h typo --- includes/learnopengl/shader_s.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/learnopengl/shader_s.h b/includes/learnopengl/shader_s.h index 0e07fe5..8c6cf32 100644 --- a/includes/learnopengl/shader_s.h +++ b/includes/learnopengl/shader_s.h @@ -66,7 +66,7 @@ public: glAttachShader(ID, fragment); glLinkProgram(ID); checkCompileErrors(ID, "PROGRAM"); - // delete the shaders as they're linked into our program now and no longer necessery + // delete the shaders as they're linked into our program now and no longer necessary glDeleteShader(vertex); glDeleteShader(fragment); } @@ -121,4 +121,4 @@ private: } }; -#endif \ No newline at end of file +#endif From f4001a9def324295fd4fb1147598f05a086f57f8 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Mon, 24 Apr 2017 19:27:16 +0200 Subject: [PATCH 2/2] Update shaders_class.cpp typo --- src/1.getting_started/3.3.shaders_class/shaders_class.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/1.getting_started/3.3.shaders_class/shaders_class.cpp b/src/1.getting_started/3.3.shaders_class/shaders_class.cpp index 90fd7d1..f69223c 100644 --- a/src/1.getting_started/3.3.shaders_class/shaders_class.cpp +++ b/src/1.getting_started/3.3.shaders_class/shaders_class.cpp @@ -39,7 +39,7 @@ int main() } - // build and compile our shader zprogram + // build and compile our shader program // ------------------------------------ Shader ourShader("3.3.shader.vs", "3.3.shader.fs"); // you can name your shader files however you like @@ -124,4 +124,4 @@ void framebuffer_size_callback(GLFWwindow* window, int width, int height) // make sure the viewport matches the new window dimensions; note that width and // height will be significantly larger than specified on retina displays. glViewport(0, 0, width, height); -} \ No newline at end of file +}