From e3f2a63db7a83098a644a0ad4c98b1b199525726 Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Thu, 22 Jul 2021 04:09:59 +0000 Subject: [PATCH] Revert "Prefer the NV_framebuffer_blit extension over ANGLE" This reverts commit 202ce887ec5d31c57716fd7798dcd640b2b2588b. Reason for revert: Need to update Chrome first to give us the NV one. Original change's description: > Prefer the NV_framebuffer_blit extension over ANGLE > > The ANGLE/CHROMIUM glBlitFramebuffer requires full size blits, which > is really bad for DMSAA. The NV extension does allow blits of > sub-rectangles, so we prefer that one if it's available. > > Bug: skia:12176 > Bug: skia:12177 > Bug: skia:12234 > Bug: skia:12235 > Change-Id: I463ac631fff64ad564f294cf2f26be7410e8c356 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/430576 > Reviewed-by: Greg Daniel > Commit-Queue: Chris Dalton # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia:12176 Bug: skia:12177 Bug: skia:12234 Bug: skia:12235 Change-Id: Iaa9f82e1c0c935a67dd8f446d1513b2b0a98f725 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/430819 Reviewed-by: Chris Dalton Commit-Queue: Chris Dalton --- src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp | 2 -- src/gpu/gl/GrGLCaps.cpp | 3 +-- src/gpu/gl/GrGLInterfaceAutogen.cpp | 1 - tools/gpu/gl/interface/interface.json5 | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp b/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp index f119b00d60..1492b36aa1 100644 --- a/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp +++ b/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp @@ -301,8 +301,6 @@ sk_sp GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc if (glVer >= GR_GL_VER(3,0)) { GET_PROC(BlitFramebuffer); - } else if (extensions.has("GL_NV_framebuffer_blit")) { - GET_PROC_SUFFIX(BlitFramebuffer, NV); } else if (extensions.has("GL_CHROMIUM_framebuffer_multisample")) { GET_PROC_SUFFIX(BlitFramebuffer, CHROMIUM); } else if (extensions.has("GL_ANGLE_framebuffer_blit")) { diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 82893efbe7..78c2fa8412 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -464,8 +464,7 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fBlitFramebufferFlags = 0; } } else if (GR_IS_GR_GL_ES(standard)) { - if (version >= GR_GL_VER(3, 0) || - ctxInfo.hasExtension("GL_NV_framebuffer_blit")) { + if (version >= GR_GL_VER(3, 0)) { fBlitFramebufferFlags = kNoFormatConversionForMSAASrc_BlitFramebufferFlag | kNoMSAADst_BlitFramebufferFlag | kRectsMustMatchForMSAASrc_BlitFramebufferFlag; diff --git a/src/gpu/gl/GrGLInterfaceAutogen.cpp b/src/gpu/gl/GrGLInterfaceAutogen.cpp index ec89c71948..7c6571e2be 100644 --- a/src/gpu/gl/GrGLInterfaceAutogen.cpp +++ b/src/gpu/gl/GrGLInterfaceAutogen.cpp @@ -486,7 +486,6 @@ bool GrGLInterface::validate() const { fExtensions.has("GL_EXT_framebuffer_blit"))) || (GR_IS_GR_GL_ES(fStandard) && ( (glVer >= GR_GL_VER(3,0)) || - fExtensions.has("GL_NV_framebuffer_blit") || fExtensions.has("GL_CHROMIUM_framebuffer_multisample") || fExtensions.has("GL_ANGLE_framebuffer_blit"))) || (GR_IS_GR_WEBGL(fStandard) && ( diff --git a/tools/gpu/gl/interface/interface.json5 b/tools/gpu/gl/interface/interface.json5 index 207af58bae..1ecd0c5a05 100644 --- a/tools/gpu/gl/interface/interface.json5 +++ b/tools/gpu/gl/interface/interface.json5 @@ -373,7 +373,6 @@ {/* else if */ "ext": "GL_ARB_framebuffer_object"}, {/* else if */ "ext": "GL_EXT_framebuffer_blit"}], "GLES": [{"min_version": [3, 0], "ext": ""}, - {/* else if */ "ext": "GL_NV_framebuffer_blit"}, {/* else if */ "ext": "GL_CHROMIUM_framebuffer_multisample"}, {/* else if */ "ext": "GL_ANGLE_framebuffer_blit"}], "WebGL": [{"min_version": [2, 0], "ext": ""}],