Bug 613324 - update WebGL constants - r=vladimir
authorBenoit Jacob <bjacob@mozilla.com>
Thu, 25 Nov 2010 08:59:35 -0500
changeset 58218 367ff816f171eb3c833e0d680dc273d92d64da83
parent 58217 8f18f55b6767206f73b8507e4195aa4e8a627e94
child 58219 215657c24079bbb00b4008d88d761369abdfc5d6
push id17206
push userbjacob@mozilla.com
push dateThu, 25 Nov 2010 15:19:01 +0000
treeherdermozilla-central@215657c24079 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvladimir
bugs613324
milestone2.0b8pre
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 613324 - update WebGL constants - r=vladimir
content/canvas/src/WebGLContext.h
content/canvas/src/WebGLContextGL.cpp
dom/interfaces/canvas/nsIDOMWebGLRenderingContext.idl
--- a/content/canvas/src/WebGLContext.h
+++ b/content/canvas/src/WebGLContext.h
@@ -57,20 +57,16 @@
 #include "nsIDOMHTMLElement.h"
 #include "nsIJSNativeInitializer.h"
 
 #include "GLContextProvider.h"
 #include "Layers.h"
 
 #include "CheckedInt.h"
 
-#define UNPACK_FLIP_Y_WEBGL            0x9240
-#define UNPACK_PREMULTIPLY_ALPHA_WEBGL 0x9241
-#define CONTEXT_LOST_WEBGL             0x9242
-
 class nsIDocShell;
 class nsIPropertyBag;
 
 namespace mozilla {
 
 class WebGLTexture;
 class WebGLBuffer;
 class WebGLProgram;
--- a/content/canvas/src/WebGLContextGL.cpp
+++ b/content/canvas/src/WebGLContextGL.cpp
@@ -1476,18 +1476,17 @@ WebGLContext::GetParameter(PRUint32 pnam
         case LOCAL_GL_MAX_FRAGMENT_UNIFORM_COMPONENTS:
         case LOCAL_GL_MAX_RENDERBUFFER_SIZE:
         case LOCAL_GL_RED_BITS:
         case LOCAL_GL_GREEN_BITS:
         case LOCAL_GL_BLUE_BITS:
         case LOCAL_GL_ALPHA_BITS:
         case LOCAL_GL_DEPTH_BITS:
         case LOCAL_GL_STENCIL_BITS:
-        case LOCAL_GL_IMPLEMENTATION_COLOR_READ_TYPE:
-        case LOCAL_GL_IMPLEMENTATION_COLOR_READ_FORMAT:
+        case UNPACK_COLORSPACE_CONVERSION_WEBGL:
         {
             GLint i = 0;
             gl->fGetIntegerv(pname, &i);
             wrval->SetAsInt32(i);
         }
             break;
 
         case LOCAL_GL_MAX_VARYING_VECTORS:
--- a/dom/interfaces/canvas/nsIDOMWebGLRenderingContext.idl
+++ b/dom/interfaces/canvas/nsIDOMWebGLRenderingContext.idl
@@ -319,17 +319,16 @@ interface nsIDOMWebGLRenderingContext : 
   /* DataType */
   const unsigned long BYTE                           = 0x1400;
   const unsigned long UNSIGNED_BYTE                  = 0x1401;
   const unsigned long SHORT                          = 0x1402;
   const unsigned long UNSIGNED_SHORT                 = 0x1403;
   const unsigned long INT                            = 0x1404;
   const unsigned long UNSIGNED_INT                   = 0x1405;
   const unsigned long FLOAT                          = 0x1406;
-  const unsigned long FIXED                          = 0x140C;
 
   /* PixelFormat */
   const unsigned long DEPTH_COMPONENT                = 0x1902;
   const unsigned long ALPHA                          = 0x1906;
   const unsigned long RGB                            = 0x1907;
   const unsigned long RGBA                           = 0x1908;
   const unsigned long LUMINANCE                      = 0x1909;
   const unsigned long LUMINANCE_ALPHA                = 0x190A;
@@ -481,20 +480,16 @@ interface nsIDOMWebGLRenderingContext : 
   const unsigned long VERTEX_ATTRIB_ARRAY_ENABLED        = 0x8622;
   const unsigned long VERTEX_ATTRIB_ARRAY_SIZE           = 0x8623;
   const unsigned long VERTEX_ATTRIB_ARRAY_STRIDE         = 0x8624;
   const unsigned long VERTEX_ATTRIB_ARRAY_TYPE           = 0x8625;
   const unsigned long VERTEX_ATTRIB_ARRAY_NORMALIZED     = 0x886A;
   const unsigned long VERTEX_ATTRIB_ARRAY_POINTER        = 0x8645;
   const unsigned long VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
 
-  /* Read Format */
-  const unsigned long IMPLEMENTATION_COLOR_READ_TYPE   = 0x8B9A;
-  const unsigned long IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B;
-
   /* Shader Source */
   const unsigned long COMPILE_STATUS                 = 0x8B81;
   const unsigned long INFO_LOG_LENGTH                = 0x8B84;
   const unsigned long SHADER_SOURCE_LENGTH           = 0x8B88;
   const unsigned long SHADER_COMPILER                = 0x8DFA;
 
   /* Shader Precision-Specified Types */
   const unsigned long LOW_FLOAT                      = 0x8DF0;
@@ -548,16 +543,18 @@ interface nsIDOMWebGLRenderingContext : 
   const unsigned long RENDERBUFFER_BINDING           = 0x8CA7;
   const unsigned long MAX_RENDERBUFFER_SIZE          = 0x84E8;
 
   const unsigned long INVALID_FRAMEBUFFER_OPERATION  = 0x0506;
 
   const unsigned long UNPACK_FLIP_Y_WEBGL            = 0x9240;
   const unsigned long UNPACK_PREMULTIPLY_ALPHA_WEBGL = 0x9241;
   const unsigned long CONTEXT_LOST_WEBGL             = 0x9242;
+  const unsigned long UNPACK_COLORSPACE_CONVERSION_WEBGL = 0x9243;
+  const unsigned long BROWSER_DEFAULT_WEBGL          = 0x9244;
 
   //
   //  ATTRIBUTES
   //
   readonly attribute nsIDOMHTMLCanvasElement canvas;
 
   //
   //  METHODS