Bug 1167504 - Part 12: Return new buffer binding points from getParameter. r=jgilbert

dom/canvas/WebGLContextState.cpp

@@ -194,21 +194,38 @@ WebGLContext::GetParameter(JSContext* cx, GLenum pname, ErrorResult& rv)
 
     if (IsWebGL2()) {
         switch (pname) {
-            case LOCAL_GL_MAX_SAMPLES:
-            case LOCAL_GL_MAX_UNIFORM_BLOCK_SIZE:
-            case LOCAL_GL_MAX_VERTEX_UNIFORM_COMPONENTS: {
-                GLint val;
-                gl->fGetIntegerv(pname, &val);
-                return JS::NumberValue(uint32_t(val));
-            }
+        case LOCAL_GL_MAX_SAMPLES:
+        case LOCAL_GL_MAX_UNIFORM_BLOCK_SIZE:
+        case LOCAL_GL_MAX_VERTEX_UNIFORM_COMPONENTS: {
+            GLint val;
+            gl->fGetIntegerv(pname, &val);
+            return JS::NumberValue(uint32_t(val));
+        }
 
-            case LOCAL_GL_TEXTURE_BINDING_3D: {
-                return WebGLObjectAsJSValue(cx, mBound3DTextures[mActiveTexture].get(), rv);
-            }
+        case LOCAL_GL_TEXTURE_BINDING_3D:
+            return WebGLObjectAsJSValue(cx, mBound3DTextures[mActiveTexture].get(), rv);
 
-            // DRAW_FRAMEBUFFER_BINDING is the same as FRAMEBUFFER_BINDING.
-            case LOCAL_GL_READ_FRAMEBUFFER_BINDING:
-                return WebGLObjectAsJSValue(cx, mBoundReadFramebuffer.get(), rv);
+        // DRAW_FRAMEBUFFER_BINDING is the same as FRAMEBUFFER_BINDING.
+        case LOCAL_GL_READ_FRAMEBUFFER_BINDING:
+            return WebGLObjectAsJSValue(cx, mBoundReadFramebuffer.get(), rv);
+
+        case LOCAL_GL_PIXEL_PACK_BUFFER_BINDING:
+            return WebGLObjectAsJSValue(cx, mBoundPixelPackBuffer.get(), rv);
+
+        case LOCAL_GL_PIXEL_UNPACK_BUFFER_BINDING:
+            return WebGLObjectAsJSValue(cx, mBoundPixelUnpackBuffer.get(), rv);
+
+        case LOCAL_GL_UNIFORM_BUFFER_BINDING:
+            return WebGLObjectAsJSValue(cx, mBoundUniformBuffer.get(), rv);
+
+        case LOCAL_GL_TRANSFORM_FEEDBACK_BUFFER_BINDING:
+            return WebGLObjectAsJSValue(cx, mBoundTransformFeedbackBuffer.get(), rv);
+
+        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);
         }
     }
 
@@ -533,13 +550,6 @@ WebGLContext::GetParameter(JSContext* cx, GLenum pname, ErrorResult& rv)
             return WebGLObjectAsJSValue(cx, mBoundArrayBuffer.get(), rv);
         }
 
-        case LOCAL_GL_TRANSFORM_FEEDBACK_BUFFER_BINDING: {
-            if (!IsWebGL2()) {
-                break;
-            }
-            return WebGLObjectAsJSValue(cx, mBoundTransformFeedbackBuffer.get(), rv);
-        }
-
         case LOCAL_GL_ELEMENT_ARRAY_BUFFER_BINDING: {
             return WebGLObjectAsJSValue(cx, mBoundVertexArray->mElementArrayBuffer.get(), rv);
         }