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

fix shader file’s variable name dismatched with source file’s.

Browse Source
This commit is contained in:
dotlive
2017-10-19 07:30:33 +08:00
parent 922e127d0e
commit 8fef6cdd3e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/1.getting_started/6.3.coordinate_systems_multiple/6.3.coordinate_systems.fs
View File

@@ -3,10 +3,10 @@ out vec4 FragColor;
in vec2 TexCoord;
uniform sampler2D ourTexture1;
uniform sampler2D ourTexture2;
uniform sampler2D texture1;
uniform sampler2D texture2;
void main()
{
FragColor = mix(texture(ourTexture1, TexCoord), texture(ourTexture2, TexCoord), 0.2);
FragColor = mix(texture(texture1, TexCoord), texture(texture2, TexCoord), 0.2);
}