diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 18:43:57 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 18:43:57 +0000 |
| commit | 2ba83f79188bf7b9bc6589c163c8978c1a9b6e3f (patch) | |
| tree | 82d91fab97215d2f91823720dce2dbc52f4ba1ca /o3d/samples/o3d-webgl/texture.js | |
| parent | dd5d083044c0a65f9756d03425ea81a6f34dcc3c (diff) | |
| download | chromium_src-2ba83f79188bf7b9bc6589c163c8978c1a9b6e3f.zip chromium_src-2ba83f79188bf7b9bc6589c163c8978c1a9b6e3f.tar.gz chromium_src-2ba83f79188bf7b9bc6589c163c8978c1a9b6e3f.tar.bz2 | |
Merged in gman's fixes to make o3d-webgl samples work in Firefox.
Resized poolballs.png to power-of-two dimensions. Retested all
o3d-webgl samples in top of tree Firefox, WebKit and Chromium.
BUG=none
TEST=none
TBR=gman,petersont
Review URL: http://codereview.chromium.org/1695031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3d-webgl/texture.js')
| -rw-r--r-- | o3d/samples/o3d-webgl/texture.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/o3d/samples/o3d-webgl/texture.js b/o3d/samples/o3d-webgl/texture.js index 7cc7927..1e63744 100644 --- a/o3d/samples/o3d-webgl/texture.js +++ b/o3d/samples/o3d-webgl/texture.js @@ -367,7 +367,10 @@ o3d.Texture2D.prototype.drawImage = 0, 0, source_img.canvas_.width, source_img.canvas_.height); this.gl.bindTexture(this.gl.TEXTURE_2D, this.texture_); - this.gl.texSubImage2D(this.gl.TEXTURE_2D, 0, 0, 0, canvas); + // TODO(petersont): replace this with a call to texSubImage2D once + // Firefox supports it. + this.gl.texImage2D(this.gl.TEXTURE_2D, 0, canvas); + // this.gl.texSubImage2D(this.gl.TEXTURE_2D, 0, 0, 0, canvas); }; |