diff options
| author | pathorn@chromium.org <pathorn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 00:33:32 +0000 |
|---|---|---|
| committer | pathorn@chromium.org <pathorn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 00:33:32 +0000 |
| commit | 1f226797e6880b7885c8866a8d7309b1c3aa44fc (patch) | |
| tree | abdce4c4772762854dede9deabe45c47d339e163 /o3d/samples/o3d-webgl/skin.js | |
| parent | 9b3fc53cf3e31fd61e24442fbdcadf8da99f56ed (diff) | |
| download | chromium_src-1f226797e6880b7885c8866a8d7309b1c3aa44fc.zip chromium_src-1f226797e6880b7885c8866a8d7309b1c3aa44fc.tar.gz chromium_src-1f226797e6880b7885c8866a8d7309b1c3aa44fc.tar.bz2 | |
o3djs: Recommit effect.js for skinning shader.
Also fixes skinning error in FF4 when getParameter(MAX_VERTEX_UNIFORM_VECTORS)
gives GL_INVALID_ENUM.
Review URL: http://codereview.chromium.org/3348006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3d-webgl/skin.js')
| -rw-r--r-- | o3d/samples/o3d-webgl/skin.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/o3d/samples/o3d-webgl/skin.js b/o3d/samples/o3d-webgl/skin.js index 1e9455c..abd77c6 100644 --- a/o3d/samples/o3d-webgl/skin.js +++ b/o3d/samples/o3d-webgl/skin.js @@ -412,6 +412,9 @@ o3d.SkinEval.getMaxNumBones = function(obj) { // The value must be at least 128. See glUniform. var gl = obj.gl; var maxVertexUniformVectors = gl.getParameter(gl.MAX_VERTEX_UNIFORM_VECTORS); + if (!maxVertexUniformVectors) { + maxVertexUniformVectors = 128; + } return Math.floor((maxVertexUniformVectors - 32) / 3); }; |