Aha, found it and fixed

2016-01-10 01:53:18 -08:00
parent 15fd83147b
commit d999828bee
2 changed files with 8 additions and 10 deletions
--- a/Conway_OpenCL/fragment_shader.sh
+++ b/Conway_OpenCL/fragment_shader.sh
@@ -6,10 +6,9 @@ out vec4 color;

 // Texture samplers
 uniform sampler2D ourTexture1;
-uniform sampler2D ourTexture2;

 void main()
 {
 	// Linearly interpolate between both textures (second texture is only slightly combined)
-	color = mix(texture(ourTexture1, TexCoord), texture(ourTexture2, TexCoord), 0.2);
+	color = texture(ourTexture1, TexCoord);
 }