Fix BlitFramebuffer issues with large rects on iOS

Enable adjustSrcDstRegionBlitFramebuffer workaround on iOS and fix a conflict when it is enabled in combination with clipSrcRegionBlitFramebuffer. Bug: angleproject:5417 Change-Id: I1de0f9f392643fbcf6900bad86d83084cb6d4009 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2601106Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Commit-Queue: James Darpinian <jdarpinian@chromium.org>

Fix BlitFramebuffer issues with large rects on iOS
7061af26 · James Darpinian · Commit Bot · 88fec1e8 · 7061af26 · 7061af26
Commit 7061af26 authored Dec 22, 2020 by James Darpinian Committed by Commit Bot Dec 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

FramebufferGL.cpp src/libANGLE/renderer/gl/FramebufferGL.cpp +4 -4

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +2 -1

No files found.
--- a/src/libANGLE/renderer/gl/FramebufferGL.cpp
+++ b/src/libANGLE/renderer/gl/FramebufferGL.cpp
@@ -806,8 +806,8 @@ angle::Result FramebufferGL::blit(const gl::Context *context,
    if (features.adjustSrcDstRegionBlitFramebuffer.enabled)
    {
-        angle::Result result =
+        angle::Result result = adjustSrcDstRegion(context, finalSourceArea, finalDestArea,
-            adjustSrcDstRegion(context, sourceArea, destArea, &finalSourceArea, &finalDestArea);
+                                                  &finalSourceArea, &finalDestArea);
        if (result != angle::Result::Continue)
        {
            return result;
@@ -815,8 +815,8 @@ angle::Result FramebufferGL::blit(const gl::Context *context,
    }
    if (features.clipSrcRegionBlitFramebuffer.enabled)
    {
-        angle::Result result =
+        angle::Result result = clipSrcRegion(context, finalSourceArea, finalDestArea,
-            clipSrcRegion(context, sourceArea, destArea, &finalSourceArea, &finalDestArea);
+                                             &finalSourceArea, &finalDestArea);
        if (result != angle::Result::Continue)
        {
            return result;

--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1765,7 +1765,8 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
                            IsApple() && isIntel && GetMacOSVersion() < OSVersion(10, 12, 6));
    ANGLE_FEATURE_CONDITION(features, adjustSrcDstRegionBlitFramebuffer,
-                            IsLinux() || (IsAndroid() && isNvidia) || (IsWindows() && isNvidia));
+                            IsLinux() || (IsAndroid() && isNvidia) || (IsWindows() && isNvidia) ||
+                                (IsApple() && functions->standard == STANDARD_GL_ES));
    ANGLE_FEATURE_CONDITION(features, clipSrcRegionBlitFramebuffer,
                            IsApple() || (IsLinux() && isAMD));