lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL

Browse Source
This commit is contained in:
Joey de Vries
2017-04-24 20:55:41 +02:00
parent 4d5aed34ac 437d55dd4f
commit 0948dfec05
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/learnopengl/shader_s.h
View File

@@ -66,7 +66,7 @@ public:
glAttachShader(ID, fragment); glAttachShader(ID, fragment);
glLinkProgram(ID); glLinkProgram(ID);
checkCompileErrors(ID, "PROGRAM"); 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(vertex);
glDeleteShader(fragment); glDeleteShader(fragment);
} }
@@ -121,4 +121,4 @@ private:
} }
}; };
#endif #endif

4
src/1.getting_started/3.3.shaders_class/shaders_class.cpp
View File

@@ -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 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 // make sure the viewport matches the new window dimensions; note that width and
// height will be significantly larger than specified on retina displays. // height will be significantly larger than specified on retina displays.
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
} }