diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-05-14 16:44:28 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-05-14 16:44:28 +0200 |
| commit | 23ba151d95e4284ddb2d5f1c9810741061c293fd (patch) | |
| tree | 98d9aa1322dc108e1adf2a695fc642266e05c2b3 /shader/fragment.glsl | |
| parent | 29ea8338efb0b5450611b73463c9d7d469db2d75 (diff) | |
| download | scop-23ba151d95e4284ddb2d5f1c9810741061c293fd.tar.gz scop-23ba151d95e4284ddb2d5f1c9810741061c293fd.tar.bz2 scop-23ba151d95e4284ddb2d5f1c9810741061c293fd.zip | |
Refactoring to the point before started refactoring, without crash on texture binding
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); } |