AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Prefer the NV_framebuffer_blit extension over ANGLE"

Browse Source 
This reverts commit 202ce887ec.

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 <egdaniel@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>

# 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 <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Chris Dalton 2021-07-22 04:09:59 +00:00 committed by Skia Commit-Bot
parent 5e332c8afc
commit e3f2a63db7
4 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp
View File

@ -301,8 +301,6 @@ sk_sp<const GrGLInterface> 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")) {

3
src/gpu/gl/GrGLCaps.cpp
View File

@ -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;

1
src/gpu/gl/GrGLInterfaceAutogen.cpp
View File

@ -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) && (

1
tools/gpu/gl/interface/interface.json5
View File

@ -373,7 +373,6 @@
{/* else if */ "ext": "GL_ARB_framebuffer_object"},
{/* else if */ "ext": "GL_EXT_framebuffer_blit"}],
"GLES": [{"min_version": [3, 0], "ext": "<core>"},
{/* 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": "<core>"}],