diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-22 18:34:29 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2017-12-22 18:34:29 +0000 |
commit | 24253190c92c9d7ef669061670a3b7596f9ee190 (patch) | |
tree | f03d785e30a7783b5e0d5e7b669cd2997d5877ed /resources | |
parent | b885965a6375f98d6bec63a43233461f9f42006d (diff) | |
download | YAGE-24253190c92c9d7ef669061670a3b7596f9ee190.tar.gz YAGE-24253190c92c9d7ef669061670a3b7596f9ee190.zip |
Changing directories and adding input support
Diffstat (limited to 'resources')
-rw-r--r-- | resources/textureshader.frag (renamed from resources/defaultshader.frag) | 8 | ||||
-rw-r--r-- | resources/textureshader.vert (renamed from resources/defaultshader.vert) | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/resources/defaultshader.frag b/resources/textureshader.frag index 1d8219a5..37a8a219 100644 --- a/resources/defaultshader.frag +++ b/resources/textureshader.frag @@ -1,8 +1,8 @@ -#version 130 +#version 450 -in vec2 fragment_position; -in vec4 fragment_colour; -in vec2 fragment_uv; +layout(location = 0) in vec2 fragment_position; +layout(location = 1) in vec4 fragment_colour; +layout(location = 2) in vec2 fragment_uv; out vec4 colour; diff --git a/resources/defaultshader.vert b/resources/textureshader.vert index 2eba9bcf..3277d8b0 100644 --- a/resources/defaultshader.vert +++ b/resources/textureshader.vert @@ -1,12 +1,12 @@ -#version 130 +#version 450 -in vec2 vertex_position; -in vec4 vertex_colour; -in vec2 vertex_uv; +layout(location = 0) in vec2 vertex_position; +layout(location = 1) in vec4 vertex_colour; +layout(location = 2) in vec2 vertex_uv; -out vec2 fragment_position; -out vec4 fragment_colour; -out vec2 fragment_uv; +layout(location = 0) out vec2 fragment_position; +layout(location = 1) out vec4 fragment_colour; +layout(location = 2) out vec2 fragment_uv; uniform mat4 P; |