From ff64cf248b308959a3823c10c2d56a8132e85b52 Mon Sep 17 00:00:00 2001
From: Paul Ivanov <pi@berkeley.edu>
Date: Wed, 26 Apr 2017 08:29:25 -0700
Subject: [PATCH] fix for 'texture' as a variable error, closes #4

---
 pixelgl/canvas.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pixelgl/canvas.go b/pixelgl/canvas.go
index 1e76b77..e50e5ed 100644
--- a/pixelgl/canvas.go
+++ b/pixelgl/canvas.go
@@ -311,14 +311,14 @@ func (cp *canvasPicture) Draw(t pixel.TargetTriangles) {
 const (
 	canvasPosition int = iota
 	canvasColor
-	canvasTexture
+	canvasTexCoords
 	canvasIntensity
 )
 
 var canvasVertexFormat = glhf.AttrFormat{
 	canvasPosition:  {Name: "position", Type: glhf.Vec2},
 	canvasColor:     {Name: "color", Type: glhf.Vec4},
-	canvasTexture:   {Name: "texture", Type: glhf.Vec2},
+	canvasTexCoords: {Name: "texCoords", Type: glhf.Vec2},
 	canvasIntensity: {Name: "intensity", Type: glhf.Float},
 }
 
@@ -341,11 +341,11 @@ var canvasVertexShader = `
 
 in vec2 position;
 in vec4 color;
-in vec2 texture;
+in vec2 texCoords;
 in float intensity;
 
 out vec4 Color;
-out vec2 Texture;
+out vec2 TexCoords;
 out float Intensity;
 
 uniform mat3 transform;
@@ -356,7 +356,7 @@ void main() {
 	vec2 normPos = (transPos - bounds.xy) / bounds.zw * 2 - vec2(1, 1);
 	gl_Position = vec4(normPos, 0.0, 1.0);
 	Color = color;
-	Texture = texture;
+	TexCoords = texCoords;
 	Intensity = intensity;
 }
 `
@@ -365,7 +365,7 @@ var canvasFragmentShader = `
 #version 330 core
 
 in vec4 Color;
-in vec2 Texture;
+in vec2 TexCoords;
 in float Intensity;
 
 out vec4 color;
@@ -380,7 +380,7 @@ void main() {
 	} else {
 		color = vec4(0, 0, 0, 0);
 		color += (1 - Intensity) * Color;
-		vec2 t = (Texture - texBounds.xy) / texBounds.zw;
+		vec2 t = (TexCoords - texBounds.xy) / texBounds.zw;
 		color += Intensity * Color * texture(tex, t);
 		color *= colorMask;
 	}