diff options
| author | David Reid <[email protected]> | 2018-04-21 17:26:40 +1000 |
|---|---|---|
| committer | David Reid <[email protected]> | 2018-04-21 17:26:40 +1000 |
| commit | f5ebbfb6bc80e5d5555e84ee505ff794c2bc64b6 (patch) | |
| tree | 800aeb61be9c2018d1a048da54d1f6ab746f11f1 /examples/others/resources/shaders | |
| parent | 950f31e620a9239dc91230ad92bb243f149e6f2c (diff) | |
| parent | 847bdaf68287f70fbeb5599361257b6f982e48c5 (diff) | |
| download | raylib-f5ebbfb6bc80e5d5555e84ee505ff794c2bc64b6.tar.gz raylib-f5ebbfb6bc80e5d5555e84ee505ff794c2bc64b6.zip | |
Merge branch 'master' of https://github.com/raysan5/raylib into dr/mini_al
Diffstat (limited to 'examples/others/resources/shaders')
| -rw-r--r-- | examples/others/resources/shaders/glsl100/standard.vs | 4 | ||||
| -rw-r--r-- | examples/others/resources/shaders/glsl330/standard.vs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/others/resources/shaders/glsl100/standard.vs b/examples/others/resources/shaders/glsl100/standard.vs index 49c5a3eb..2b958938 100644 --- a/examples/others/resources/shaders/glsl100/standard.vs +++ b/examples/others/resources/shaders/glsl100/standard.vs @@ -10,7 +10,7 @@ varying vec2 fragTexCoord; varying vec4 fragColor; varying vec3 fragNormal; -uniform mat4 mvpMatrix; +uniform mat4 mvp; void main() { @@ -19,5 +19,5 @@ void main() fragColor = vertexColor; fragNormal = vertexNormal; - gl_Position = mvpMatrix*vec4(vertexPosition, 1.0); + gl_Position = mvp*vec4(vertexPosition, 1.0); }
\ No newline at end of file diff --git a/examples/others/resources/shaders/glsl330/standard.vs b/examples/others/resources/shaders/glsl330/standard.vs index fc0a5ff4..7fbdbf5e 100644 --- a/examples/others/resources/shaders/glsl330/standard.vs +++ b/examples/others/resources/shaders/glsl330/standard.vs @@ -10,7 +10,7 @@ out vec2 fragTexCoord; out vec4 fragColor; out vec3 fragNormal; -uniform mat4 mvpMatrix; +uniform mat4 mvp; void main() { @@ -19,5 +19,5 @@ void main() fragColor = vertexColor; fragNormal = vertexNormal; - gl_Position = mvpMatrix*vec4(vertexPosition, 1.0); + gl_Position = mvp*vec4(vertexPosition, 1.0); }
\ No newline at end of file |