From e0c26f1caaab9001b081022c6c6a69e817e27a0f Mon Sep 17 00:00:00 2001
From: Brandon <thegtproject@live.com>
Date: Mon, 18 Jun 2018 00:54:49 -0600
Subject: [PATCH] quick corrections to previous commit

---
 pixelgl/canvas.go | 15 +++++++--------
 pixelgl/shader.go |  3 ---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pixelgl/canvas.go b/pixelgl/canvas.go
index 8587379..b89fc9e 100644
--- a/pixelgl/canvas.go
+++ b/pixelgl/canvas.go
@@ -288,6 +288,13 @@ func (ct *canvasTriangles) draw(tex *glhf.Texture, bounds pixel.Rect) {
 			float32(dstBounds.W()),
 			float32(dstBounds.H()),
 		}
+		bx, by, bw, bh := intBounds(bounds)
+		ct.dst.shader.uniformDefaults.texbounds = mgl32.Vec4{
+			float32(bx),
+			float32(by),
+			float32(bw),
+			float32(bh),
+		}
 
 		for loc, u := range ct.dst.shader.uniforms {
 			ct.dst.shader.s.SetUniformAttr(loc, u.Value)
@@ -300,14 +307,6 @@ func (ct *canvasTriangles) draw(tex *glhf.Texture, bounds pixel.Rect) {
 		} else {
 			tex.Begin()
 
-			bx, by, bw, bh := intBounds(bounds)
-			shader.SetUniformAttr(canvasTexBounds, &mgl32.Vec4{
-				float32(bx),
-				float32(by),
-				float32(bw),
-				float32(bh),
-			})
-
 			if tex.Smooth() != smt {
 				tex.SetSmooth(smt)
 			}
diff --git a/pixelgl/shader.go b/pixelgl/shader.go
index 685f525..f90a154 100644
--- a/pixelgl/shader.go
+++ b/pixelgl/shader.go
@@ -1,8 +1,6 @@
 package pixelgl
 
 import (
-	"fmt"
-
 	"github.com/faiface/glhf"
 	"github.com/faiface/mainthread"
 	"github.com/faiface/pixel"
@@ -67,7 +65,6 @@ func (gs *GLShader) GetUniform(Name string) int {
 }
 func (gs *GLShader) AddUniform(Name string, Value interface{}) {
 	Type := getUniformType(Value)
-	fmt.Println(Type)
 	if loc := gs.GetUniform(Name); loc > -1 {
 		gs.uniforms[loc].Name = Name
 		gs.uniforms[loc].Type = Type