Bug 1427668 - Move the webgl backbuffer into webgl. - r=daoshengmu

MozReview-Commit-ID: 2WpG7mfMRQ8

Author: kdashg

dom/canvas/OffscreenCanvas.cpp

@@ -225,14 +225,7 @@ OffscreenCanvas::TransferToImageBitmap(ErrorResult& aRv)
     return nullptr;
   }
 
-  // Clear the content.
-  if ((mCurrentContextType == CanvasContextType::WebGL1 ||
-       mCurrentContextType == CanvasContextType::WebGL2))
-  {
-    WebGLContext* webGL = static_cast<WebGLContext*>(mCurrentContext.get());
-    webGL->ClearScreen();
-  }
-
+  // TODO: Clear the content?
   return result.forget();
 }
 

dom/canvas/WebGL2ContextFramebuffers.cpp

@@ -40,29 +40,18 @@ WebGL2Context::BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY
 
     ////
 
-    const auto& readFB = mBoundReadFramebuffer;
-    if (readFB &&
-        !readFB->ValidateAndInitAttachments("blitFramebuffer's READ_FRAMEBUFFER"))
+    if (!ValidateAndInitFB("blitFramebuffer: READ_FRAMEBUFFER", mBoundReadFramebuffer) ||
+        !ValidateAndInitFB("blitFramebuffer: DRAW_FRAMEBUFFER", mBoundDrawFramebuffer))
     {
         return;
     }
 
-    const auto& drawFB = mBoundDrawFramebuffer;
-    if (drawFB &&
-        !drawFB->ValidateAndInitAttachments("blitFramebuffer's DRAW_FRAMEBUFFER"))
-    {
-        return;
-    }
-
-    ////
-
-    if (!mBoundReadFramebuffer) {
-        ClearBackbufferIfNeeded();
-    }
+    DoBindFB(mBoundReadFramebuffer, LOCAL_GL_READ_FRAMEBUFFER);
+    DoBindFB(mBoundDrawFramebuffer, LOCAL_GL_DRAW_FRAMEBUFFER);
 
     WebGLFramebuffer::BlitFramebuffer(this,
-                                      readFB, srcX0, srcY0, srcX1, srcY1,
-                                      drawFB, dstX0, dstY0, dstX1, dstY1,
+                                      srcX0, srcY0, srcX1, srcY1,
+                                      dstX0, dstY0, dstX1, dstY1,
                                       mask, filter);
 }
 
@@ -170,23 +159,25 @@ WebGLContext::ValidateInvalidateFramebuffer(const char* funcName, GLenum target,
         return false;
 
     const WebGLFramebuffer* fb;
-    bool isDefaultFB;
+    bool isDefaultFB = false;
     switch (target) {
     case LOCAL_GL_FRAMEBUFFER:
     case LOCAL_GL_DRAW_FRAMEBUFFER:
         fb = mBoundDrawFramebuffer;
-        isDefaultFB = gl->Screen()->IsDrawFramebufferDefault();
         break;
 
     case LOCAL_GL_READ_FRAMEBUFFER:
         fb = mBoundReadFramebuffer;
-        isDefaultFB = gl->Screen()->IsReadFramebufferDefault();
         break;
 
     default:
         MOZ_CRASH("GFX: Bad target.");
     }
 
+    if (!ValidateAndInitFB(funcName, fb))
+        return false;
+    DoBindFB(fb, target);
+
     *out_glNumAttachments = attachments.Length();
     *out_glAttachments = attachments.Elements();
 
@@ -230,13 +221,9 @@ WebGLContext::ValidateInvalidateFramebuffer(const char* funcName, GLenum target,
     ////
 
     if (!fb) {
-        ClearBackbufferIfNeeded();
-
-        // Don't do more validation after these.
-        Invalidate();
-        mShouldPresent = true;
+        mDefaultFB_IsInvalid = true;
+        mResolvedDefaultFB = nullptr;
     }
-
     return true;
 }
 
@@ -331,7 +318,7 @@ WebGL2Context::ReadBuffer(GLenum mode)
         return;
     }
 
-    gl->Screen()->SetReadBuffer(mode);
+    mDefaultFB_ReadBuffer = mode;
 }
 
 } // namespace mozilla

dom/canvas/WebGL2ContextMRTs.cpp

@@ -62,11 +62,11 @@ WebGL2Context::ValidateClearBuffer(const char* funcName, GLenum buffer, GLint dr
 
     ////
 
+    if (!BindCurFBForDraw(funcName))
+        return false;
+
     const auto& fb = mBoundDrawFramebuffer;
     if (fb) {
-        if (!fb->ValidateAndInitAttachments(funcName))
-            return false;
-
         if (!fb->ValidateClearBufferType(funcName, buffer, drawBuffer, funcType))
             return false;
     } else if (buffer == LOCAL_GL_COLOR) {
@@ -110,6 +110,13 @@ WebGL2Context::ClearBufferfv(GLenum buffer, GLint drawBuffer, const Float32Arr&
         return;
     }
 
+    if (!mBoundDrawFramebuffer &&
+        buffer == LOCAL_GL_DEPTH &&
+        mNeedsFakeNoDepth)
+    {
+        return;
+    }
+
     ScopedDrawCallWrapper wrapper(*this);
     const auto ptr = src.elemBytes + srcElemOffset;
     gl->fClearBufferfv(buffer, drawBuffer, ptr);
@@ -136,6 +143,13 @@ WebGL2Context::ClearBufferiv(GLenum buffer, GLint drawBuffer, const Int32Arr& sr
         return;
     }
 
+    if (!mBoundDrawFramebuffer &&
+        buffer == LOCAL_GL_STENCIL &&
+        mNeedsFakeNoStencil)
+    {
+        return;
+    }
+
     ScopedDrawCallWrapper wrapper(*this);
     const auto ptr = src.elemBytes + srcElemOffset;
     gl->fClearBufferiv(buffer, drawBuffer, ptr);
@@ -179,8 +193,18 @@ WebGL2Context::ClearBufferfi(GLenum buffer, GLint drawBuffer, GLfloat depth,
     if (!ValidateClearBuffer(funcName, buffer, drawBuffer, 2, 0, 0))
         return;
 
+    auto driverDepth = depth;
+    auto driverStencil = stencil;
+    if (!mBoundDrawFramebuffer) {
+        if (mNeedsFakeNoDepth) {
+            driverDepth = 1.0f;
+        } else if (mNeedsFakeNoStencil) {
+            driverStencil = 0;
+        }
+    }
+
     ScopedDrawCallWrapper wrapper(*this);
-    gl->fClearBufferfi(buffer, drawBuffer, depth, stencil);
+    gl->fClearBufferfi(buffer, drawBuffer, driverDepth, driverStencil);
 }
 
 } // namespace mozilla

dom/canvas/WebGL2ContextState.cpp

@@ -45,7 +45,7 @@ WebGL2Context::GetParameter(JSContext* cx, GLenum pname, ErrorResult& rv)
     /* GLenum */
     case LOCAL_GL_READ_BUFFER: {
       if (!mBoundReadFramebuffer)
-        return JS::Int32Value(gl->Screen()->GetReadBufferMode());
+        return JS::Int32Value(mDefaultFB_ReadBuffer);
 
       if (!mBoundReadFramebuffer->ColorReadBuffer())
         return JS::Int32Value(LOCAL_GL_NONE);