update global webgl context before calling texture methods, fixes eva…

…nw#11
dkozma · Feb 10, 2013 · eddd11e · eddd11e
1 parent a8a03b4
commit eddd11e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/core/canvas.js b/src/core/canvas.js
@@ -7,8 +7,16 @@ function clamp(lo, value, hi) {
 function wrapTexture(texture) {
     return {
         _: texture,
-        loadContentsOf: function(element) { this._.loadContentsOf(element); },
-        destroy: function() { this._.destroy(); }
+        loadContentsOf: function(element) {
+            // Make sure that we're using the correct global WebGL context
+            gl = this._.gl;
+            this._.loadContentsOf(element);
+        },
+        destroy: function() {
+            // Make sure that we're using the correct global WebGL context
+            gl = this._.gl;
+            this._.destroy();
+        }
     };
 }
 

diff --git a/src/core/texture.js b/src/core/texture.js
@@ -6,6 +6,7 @@ var Texture = (function() {
     };
 
     function Texture(width, height, format, type) {
+        this.gl = gl;
         this.id = gl.createTexture();
         this.width = width;
         this.height = height;

diff --git a/tests/texture.loadContentsOf.html b/tests/texture.loadContentsOf.html
@@ -2,11 +2,12 @@
 <script>
 
 window.onload = function() {
-    var canvas = fx.canvas();
-    document.body.appendChild(canvas);
-    var texture = canvas.texture(document.getElementById('imageA'));
+    var canvasA = fx.canvas();
+    document.body.appendChild(canvasA);
+    var texture = canvasA.texture(document.getElementById('imageA'));
+    var canvasB = fx.canvas();
     texture.loadContentsOf(document.getElementById('imageB'));
-    canvas.draw(texture).update();
+    canvasA.draw(texture).update();
 };
 
 </script>