summaryrefslogtreecommitdiffstats
path: root/o3d/samples/o3d-webgl
diff options
context:
space:
mode:
authorluchen@google.com <luchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 21:56:11 +0000
committerluchen@google.com <luchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 21:56:11 +0000
commit1f84ed4f9d0cc61b4d77cbb1a0101d76a569b019 (patch)
treedc8d18aa81dbc6313fa79937e3e82e0b78bb8277 /o3d/samples/o3d-webgl
parent7c961878cf318a96534620c3a1563ec7fa095b73 (diff)
downloadchromium_src-1f84ed4f9d0cc61b4d77cbb1a0101d76a569b019.zip
chromium_src-1f84ed4f9d0cc61b4d77cbb1a0101d76a569b019.tar.gz
chromium_src-1f84ed4f9d0cc61b4d77cbb1a0101d76a569b019.tar.bz2
o3d-webgl: Adjusting Sampler to throw an error if client attempts to use BORDER as uv address mode (not supported in WebGL).
Review URL: http://codereview.chromium.org/3038014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3d-webgl')
-rw-r--r--o3d/samples/o3d-webgl/sampler.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/o3d/samples/o3d-webgl/sampler.js b/o3d/samples/o3d-webgl/sampler.js
index 4e651a9..e4d6513 100644
--- a/o3d/samples/o3d-webgl/sampler.js
+++ b/o3d/samples/o3d-webgl/sampler.js
@@ -180,10 +180,9 @@ o3d.Sampler.prototype.convertAddressMode_ = function(o3d_mode) {
gl_mode = this.gl.CLAMP_TO_EDGE;
break;
case o3d.Sampler.BORDER:
- gl_mode = this.gl.CLAMP_TO_BORDER;
- break;
+ // This is not supported in WebGL.
default:
- this.gl.client.error_callback("Unknown Address mode");
+ this.gl.client.error_callback("Unknown/Unavailable Address mode");
break;
}
return gl_mode;