These changes are needed for when we turn on REAL ...

samples/o3d-webgl/texture.js

 /*
  * Copyright 2010, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 207 matching lines @@
  * size.
  * @param {HTMLCanvas} canvas The canvas to load into the texture.
  * @param {boolean} resize_to_pot Whether or not to resize to a power of two
  *     size.
  * @param {boolean} generate_mips Whether or not to generate mips.
  *
  * @private
  */
 o3d.Texture.prototype.setFromCanvas_ =
     function(canvas, resize_to_pot, flip, generate_mips, face) {
-  this.gl.bindTexture(this.texture_target_, this.texture_);
+  var gl = this.gl;
+  gl.bindTexture(this.texture_target_, this.texture_);
 
   if (resize_to_pot && (!o3d.Texture.isPowerOfTwo_(canvas.width) ||
       !o3d.Texture.isPowerOfTwo_(canvas.height))) {
     // Get a scratch canvas.
     var scratch = o3d.Bitmap.getScratchCanvas_();
     // Set the size of the canvas to the power-of-two size.
     scratch.width = o3d.Texture.nextHighestPowerOfTwo_(canvas.width);
     scratch.height = o3d.Texture.nextHighestPowerOfTwo_(canvas.height);
     // Draw the given canvas into that scratch canvas.
     scratch.getContext("2d").drawImage(canvas,
         0, 0, canvas.width, canvas.height,
         0, 0, scratch.width, scratch.height);
     canvas = scratch;
   }
 
   var target = this.texture_target_;
   if (target == this.gl.TEXTURE_CUBE_MAP) {
     target = this.gl.TEXTURE_CUBE_MAP_POSITIVE_X + face;
   }
 
-  this.gl.texImage2D(target, 0 /*level*/, canvas, flip);
+  gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flip);
+  gl.texImage2D(
+      target, 0 /*level*/, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, canvas);
+  gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, 0);
   this.texture_width_ = canvas.width;
   this.texture_height_ = canvas.height;
 
   if (generate_mips) {
     // The texture target is already bound so why bind it again by calling
     // this.generateMip.
     this.gl.generateMipmap(this.texture_target_);
   }
 };
 
@@ skipping 231 matching lines @@
 
   var context = canvas.getContext('2d');
 
   context.translate(-source_x, -source_y);
   context.scale(dest_width / source_width,
                 dest_height / source_height);
 
   context.drawImage(source_img.canvas_,
       0, 0, source_img.canvas_.width, source_img.canvas_.height);
 
-  this.gl.bindTexture(this.gl.TEXTURE_2D, this.texture_);
+  var gl = this.gl;
+  gl.bindTexture(gl.TEXTURE_2D, this.texture_);
   // TODO(petersont): replace this with a call to texSubImage2D once
   // Firefox supports it.
-  this.gl.texImage2D(this.gl.TEXTURE_2D, 0, canvas);
+  gl.texImage2D(
+      gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, canvas);
   // this.gl.texSubImage2D(this.gl.TEXTURE_2D, 0, 0, 0, canvas);
   this.texture_width_ = canvas.width;
   this.texture_height_ = canvas.height;
 };
 
 
 /**
  * TextureCUBE is a class for textures used for cube mapping.  A cube texture
  * stores bitmaps for the 6 faces of a cube and is addressed via three texture
  * coordinates.
@@ skipping 262 matching lines @@
     this.parameter_cache_.minFilter = minFilter;
   }
 
   if (this.parameter_cache_.magFilter != magFilter) {
     this.gl.texParameteri(target, this.gl.TEXTURE_MAG_FILTER, magFilter);
     this.parameter_cache_.magFilter = magFilter;
   }
 };