GL: Check framebuffer completeness before running blit shaders.

src/libANGLE/renderer/gl/BlitGL.cpp

@@ -514,7 +514,7 @@ gl::Error BlitGL::blitColorBufferWithShader(const gl::Framebuffer *source,
     return gl::NoError();
 }
 
-gl::Error BlitGL::copySubTexture(const gl::Context *context,
+gl::ErrorOrResult<bool> BlitGL::copySubTexture(const gl::Context *context,
                                                TextureGL *source,
                                                size_t sourceLevel,
                                                GLenum sourceComponentType,
@@ -534,6 +534,17 @@ gl::Error BlitGL::copySubTexture(const gl::Context *context,
     ASSERT(source->getType() == gl::TextureType::_2D);
     ANGLE_TRY(initializeResources());
 
+    // Make sure the destination texture can be rendered to before setting anything else up.  Some
+    // cube maps may not be renderable until all faces have been filled.
+    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
+    mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, ToGLenum(destTarget),
+                                     dest->getTextureID(), static_cast<GLint>(destLevel));
+    GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
+    if (status != GL_FRAMEBUFFER_COMPLETE)
+    {
+        return false;
+    }
+
     BlitProgramType blitProgramType = getBlitProgramType(sourceComponentType, destComponentType);
     BlitProgram *blitProgram        = nullptr;
     ANGLE_TRY(getBlitProgram(blitProgramType, &blitProgram));
@@ -598,14 +609,10 @@ gl::Error BlitGL::copySubTexture(const gl::Context *context,
         mFunctions->uniform1i(blitProgram->unMultiplyAlphaLocation, unpackUnmultiplyAlpha);
     }
 
-    mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
-    mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, ToGLenum(destTarget),
-                                     dest->getTextureID(), static_cast<GLint>(destLevel));
-
     mStateManager->bindVertexArray(mVAO, 0);
     mFunctions->drawArrays(GL_TRIANGLES, 0, 3);
 
-    return gl::NoError();
+    return true;
 }
 
 gl::Error BlitGL::copySubTextureCPUReadback(const gl::Context *context,
@@ -686,7 +693,7 @@ gl::Error BlitGL::copySubTextureCPUReadback(const gl::Context *context,
     return gl::NoError();
 }
 
-gl::Error BlitGL::copyTexSubImage(TextureGL *source,
+gl::ErrorOrResult<bool> BlitGL::copyTexSubImage(TextureGL *source,
                                                 size_t sourceLevel,
                                                 TextureGL *dest,
                                                 gl::TextureTarget destTarget,
@@ -696,9 +703,15 @@ gl::Error BlitGL::copyTexSubImage(TextureGL *source,
 {
     ANGLE_TRY(initializeResources());
 
+    // Make sure the source texture can create a complete framebuffer before continuing.
     mStateManager->bindFramebuffer(GL_FRAMEBUFFER, mScratchFBO);
     mFunctions->framebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D,
                                      source->getTextureID(), static_cast<GLint>(sourceLevel));
+    GLenum status = mFunctions->checkFramebufferStatus(GL_FRAMEBUFFER);
+    if (status != GL_FRAMEBUFFER_COMPLETE)
+    {
+        return false;
+    }
 
     mStateManager->bindTexture(dest->getType(), dest->getTextureID());
 
@@ -706,7 +719,7 @@ gl::Error BlitGL::copyTexSubImage(TextureGL *source,
                                   destOffset.y, sourceArea.x, sourceArea.y, sourceArea.width,
                                   sourceArea.height);
 
-    return gl::NoError();
+    return true;
 }
 
 gl::ErrorOrResult<bool> BlitGL::clearRenderableTexture(TextureGL *source,

src/libANGLE/renderer/gl/BlitGL.h

@@ -66,7 +66,7 @@ class BlitGL : angle::NonCopyable
                                         const gl::Rectangle &destArea,
                                         GLenum filter);
 
-    gl::Error copySubTexture(const gl::Context *context,
+    gl::ErrorOrResult<bool> copySubTexture(const gl::Context *context,
                                            TextureGL *source,
                                            size_t sourceLevel,
                                            GLenum sourceComponentType,
@@ -98,7 +98,7 @@ class BlitGL : angle::NonCopyable
                                         bool unpackPremultiplyAlpha,
                                         bool unpackUnmultiplyAlpha);
 
-    gl::Error copyTexSubImage(TextureGL *source,
+    gl::ErrorOrResult<bool> copyTexSubImage(TextureGL *source,
                                             size_t sourceLevel,
                                             TextureGL *dest,
                                             gl::TextureTarget destTarget,

src/libANGLE/renderer/gl/TextureGL.cpp

@@ -771,8 +771,14 @@ gl::Error TextureGL::copySubTextureHelper(const gl::Context *context,
         sourceFormatContainSupersetOfDestFormat && sourceComponentType == destComponentType &&
         !destSRGB)
     {
-        return mBlitter->copyTexSubImage(sourceGL, sourceLevel, this, target, level, sourceArea,
-                                         destOffset);
+        bool copySucceded = false;
+        ANGLE_TRY_RESULT(mBlitter->copyTexSubImage(sourceGL, sourceLevel, this, target, level,
+                                                   sourceArea, destOffset),
+                         copySucceded);
+        if (copySucceded)
+        {
+            return gl::NoError();
+        }
     }
 
     // Check if the destination is renderable and copy on the GPU
@@ -780,11 +786,17 @@ gl::Error TextureGL::copySubTextureHelper(const gl::Context *context,
     if (!destSRGB && nativegl::SupportsNativeRendering(mFunctions, getType(),
                                                        destLevelInfo.nativeInternalFormat))
     {
-        return mBlitter->copySubTexture(context, sourceGL, sourceLevel, sourceComponentType, this,
-                                        target, level, destComponentType, sourceImageDesc.size,
-                                        sourceArea, destOffset, needsLumaWorkaround,
-                                        sourceLevelInfo.sourceFormat, unpackFlipY,
-                                        unpackPremultiplyAlpha, unpackUnmultiplyAlpha);
+        bool copySucceded = false;
+        ANGLE_TRY_RESULT(mBlitter->copySubTexture(
+                             context, sourceGL, sourceLevel, sourceComponentType, this, target,
+                             level, destComponentType, sourceImageDesc.size, sourceArea, destOffset,
+                             needsLumaWorkaround, sourceLevelInfo.sourceFormat, unpackFlipY,
+                             unpackPremultiplyAlpha, unpackUnmultiplyAlpha),
+                         copySucceded);
+        if (copySucceded)
+        {
+            return gl::NoError();
+        }
     }
 
     // Fall back to CPU-readback