author | Benoit Jacob <bjacob@mozilla.com> |
Tue, 10 Apr 2012 12:23:23 -0400 | |
changeset 91321 | b1bed3ae047663cf7431986276ebc2d46cde805a |
parent 91320 | 95a886a80f9bee11f1cac4c31f4b49f04ca84719 |
child 91322 | 6c93d7eb039aea2723d1c03a14e5e81ab36e5979 |
push id | 22438 |
push user | mbrubeck@mozilla.com |
push date | Wed, 11 Apr 2012 15:56:36 +0000 |
treeherder | mozilla-central@63f78a93ae5c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 743813 |
milestone | 14.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/canvas/src/WebGLContextGL.cpp +++ b/content/canvas/src/WebGLContextGL.cpp @@ -130,17 +130,17 @@ NS_IMETHODIMP WebGLContext::name(t1 a1, /* void GlActiveTexture (in GLenum texture); */ NS_IMETHODIMP WebGLContext::ActiveTexture(WebGLenum texture) { if (!IsContextStable()) return NS_OK; if (texture < LOCAL_GL_TEXTURE0 || - texture >= LOCAL_GL_TEXTURE0 + mGLMaxTextureUnits) + texture >= LOCAL_GL_TEXTURE0 + PRUint32(mGLMaxTextureUnits)) { return ErrorInvalidEnum( "ActiveTexture: texture unit %d out of range. " "Accepted values range from TEXTURE0 to TEXTURE0 + %d. " "Notice that TEXTURE0 != 0.", texture, mGLMaxTextureUnits); }