diff options
Diffstat (limited to 'shader/fragment.glsl')
| -rw-r--r-- | shader/fragment.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shader/fragment.glsl b/shader/fragment.glsl index b864732..4ada539 100644 --- a/shader/fragment.glsl +++ b/shader/fragment.glsl @@ -1,13 +1,13 @@ #version 400 core in vec4 v_color; -/* in vec2 v_texture_coord; */ +in vec2 v_texture_coord; out vec4 out_color; -/* uniform sampler2D u_texture; */ +uniform sampler2D u_texture; void main() { - out_color = v_color; //+ texture(u_texture, v_texture_coord); + out_color = texture(u_texture, v_texture_coord); } |