Bug 1318523 - Unify VAO idl. - r=qdot a=gchang
authorJeff Gilbert (:jgilbert) <jgilbert@mozilla.com>
Thu, 17 Nov 2016 16:46:28 -0800
changeset 359113 20f13465735a0bd580216249112ab7170dfd3d94
parent 359112 5b85d13c47da1b65eca8694f891fdfe2b271bc07
child 359114 7a08e435f8c852c03e2fde8cbe4decfe34ef8c0b
push id1324
push usermtabara@mozilla.com
push dateMon, 16 Jan 2017 13:07:44 +0000
treeherdermozilla-release@a01c49833940 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersqdot, gchang
bugs1318523
milestone51.0
Bug 1318523 - Unify VAO idl. - r=qdot a=gchang MozReview-Commit-ID: 21MUxpriDcj
dom/bindings/Bindings.conf
dom/webidl/WebGL2RenderingContext.webidl
dom/webidl/WebGLRenderingContext.webidl
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -1459,17 +1459,17 @@ DOMInterfaces = {
     'headerFile': 'WebGLTransformFeedback.h'
 },
 
 'WebGLUniformLocation': {
     'nativeType': 'mozilla::WebGLUniformLocation',
     'headerFile': 'WebGLUniformLocation.h'
 },
 
-'WebGLVertexArrayObjectOES': {
+'WebGLVertexArrayObject': {
     'nativeType': 'mozilla::WebGLVertexArray',
     'headerFile': 'WebGLVertexArray.h'
 },
 
 'WebrtcGlobalInformation': {
     'nativeType': 'mozilla::dom::WebrtcGlobalInformation',
     'headerFile': 'WebrtcGlobalInformation.h',
     'wrapperCache': False,
--- a/dom/webidl/WebGL2RenderingContext.webidl
+++ b/dom/webidl/WebGL2RenderingContext.webidl
@@ -17,20 +17,16 @@ interface WebGLSampler {
 [Pref="webgl.enable-webgl2"]
 interface WebGLSync {
 };
 
 [Pref="webgl.enable-webgl2"]
 interface WebGLTransformFeedback {
 };
 
-[Pref="webgl.enable-webgl2"]
-interface WebGLVertexArrayObject {
-};
-
 typedef (Uint32Array or sequence<GLuint>) Uint32List;
 
 [Pref="webgl.enable-webgl2"]
 interface WebGL2RenderingContext : WebGLRenderingContext
 {
     const GLenum READ_BUFFER                                   = 0x0C02;
     const GLenum UNPACK_ROW_LENGTH                             = 0x0CF2;
     const GLenum UNPACK_SKIP_ROWS                              = 0x0CF3;
--- a/dom/webidl/WebGLRenderingContext.webidl
+++ b/dom/webidl/WebGLRenderingContext.webidl
@@ -75,17 +75,17 @@ interface WebGLShader {
 interface WebGLTexture {
 };
 
 [Exposed=(Window,Worker),
  Func="mozilla::dom::OffscreenCanvas::PrefEnabledOnWorkerThread"]
 interface WebGLUniformLocation {
 };
 
-interface WebGLVertexArrayObjectOES {
+interface WebGLVertexArrayObject {
 };
 
 [Exposed=(Window,Worker),
  Func="mozilla::dom::OffscreenCanvas::PrefEnabledOnWorkerThread"]
 interface WebGLActiveInfo {
     readonly attribute GLint size;
     readonly attribute GLenum type;
     readonly attribute DOMString name;
@@ -976,20 +976,20 @@ interface EXT_color_buffer_half_float
     const GLenum FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT = 0x8211;
     const GLenum UNSIGNED_NORMALIZED_EXT = 0x8C17;
 };
 
 [NoInterfaceObject]
 interface OES_vertex_array_object {
     const GLenum VERTEX_ARRAY_BINDING_OES = 0x85B5;
 
-    WebGLVertexArrayObjectOES? createVertexArrayOES();
-    void deleteVertexArrayOES(WebGLVertexArrayObjectOES? arrayObject);
-    [WebGLHandlesContextLoss] GLboolean isVertexArrayOES(WebGLVertexArrayObjectOES? arrayObject);
-    void bindVertexArrayOES(WebGLVertexArrayObjectOES? arrayObject);
+    WebGLVertexArrayObject? createVertexArrayOES();
+    void deleteVertexArrayOES(WebGLVertexArrayObject? arrayObject);
+    [WebGLHandlesContextLoss] GLboolean isVertexArrayOES(WebGLVertexArrayObject? arrayObject);
+    void bindVertexArrayOES(WebGLVertexArrayObject? arrayObject);
 };
 
 [NoInterfaceObject]
 interface ANGLE_instanced_arrays {
     const GLenum VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE = 0x88FE;
 
     void drawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei primcount);
     void drawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, GLintptr offset, GLsizei primcount);