Bug 1170855 - Part 8: MAX_SERVER_WAIT_TIMEOUT is unsigned. r=jgilbert
authorDan Glastonbury <dglastonbury@mozilla.com>
Tue, 09 Jun 2015 10:32:22 +1000
changeset 248252 349b053438b3b8905c32cd78bc0c007864579526
parent 248251 9225d09342f20cea437aef4e0346e6f343149e9e
child 248253 eb6b86397048e222a1bd698800470c2497cc668f
push id28893
push userkwierso@gmail.com
push dateFri, 12 Jun 2015 00:02:58 +0000
treeherderautoland@8cf9d3e497f9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1170855
milestone41.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
Bug 1170855 - Part 8: MAX_SERVER_WAIT_TIMEOUT is unsigned. r=jgilbert
dom/canvas/WebGL2ContextState.cpp
--- a/dom/canvas/WebGL2ContextState.cpp
+++ b/dom/canvas/WebGL2ContextState.cpp
@@ -76,23 +76,30 @@ WebGL2Context::GetParameter(JSContext* c
 
     /* GLint64 */
     case LOCAL_GL_MAX_CLIENT_WAIT_TIMEOUT_WEBGL:
       return JS::NumberValue(0); // TODO
 
     case LOCAL_GL_MAX_ELEMENT_INDEX:
     case LOCAL_GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS:
     case LOCAL_GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS:
-    case LOCAL_GL_MAX_SERVER_WAIT_TIMEOUT:
     case LOCAL_GL_MAX_UNIFORM_BLOCK_SIZE: {
       GLint64 val;
       gl->fGetInteger64v(pname, &val);
       return JS::DoubleValue(static_cast<double>(val));
     }
 
+
+      // GLuint64
+    case LOCAL_GL_MAX_SERVER_WAIT_TIMEOUT: {
+      GLuint64 val;
+      gl->fGetInteger64v(pname, (GLint64*) &val);
+      return JS::DoubleValue(static_cast<double>(val));
+    }
+
     case LOCAL_GL_COPY_READ_BUFFER_BINDING:
       return WebGLObjectAsJSValue(cx, mBoundCopyReadBuffer.get(), rv);
 
     case LOCAL_GL_COPY_WRITE_BUFFER_BINDING:
       return WebGLObjectAsJSValue(cx, mBoundCopyWriteBuffer.get(), rv);
 
     case LOCAL_GL_PIXEL_PACK_BUFFER_BINDING:
       return WebGLObjectAsJSValue(cx, mBoundPixelPackBuffer.get(), rv);