learn opengl

shader.fs

@@ -1,7 +1,19 @@
 #version 330 core
 
+in vec3 Color;
+in vec2 TexCoords;
+
+uniform int triangleColor;
+
+uniform sampler2D kitty;
+uniform sampler2D puppy;
+
 out vec4 outColor;
 
 void main(){
-	outColor = vec4(1.0, 1.0, 1.0, 1.0);
+	vec4 kit = texture(kitty, TexCoords);
+	vec4 pup = texture(puppy, TexCoords);
+	outColor = pup;
 }
+
+/* vim: set ft=glsl: */