diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-06-05 08:46:02 -0400 |
|---|---|---|
| committer | Robert Phillips <robertphillips@google.com> | 2017-06-05 13:16:13 +0000 |
| commit | e18474e8644eabfe62bc9f05a2483dcb7572c494 (patch) | |
| tree | ef2f0a5e6fd2e93d315f80f3743f9015e71100f4 | |
| parent | c8167f167dc78f74d65b5e9f35684d0cded9b44c (diff) | |
Re-enable single channel renderability for ANGLE ES2
Since the ANGLE-side fix has landed & been rolled into Skia we no longer need this workaround.
Change-Id: I9e6296976d53fc1c87232f918a5c0257201744bf
Reviewed-on: https://skia-review.googlesource.com/18583
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 5aca304194..c672cb9a59 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -1800,11 +1800,8 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, GR_GL_ALPHA; fConfigTable[kAlpha_8_GrPixelConfig].fSwizzle = GrSwizzle::AAAA(); } - if ((this->textureRedSupport() && - (ctxInfo.renderer() != kANGLE_GrGLRenderer || kGLES_GrGLStandard != standard)) || + if (this->textureRedSupport() || (kStandard_MSFBOType == this->msFBOType() && ctxInfo.renderer() != kOSMesa_GrGLRenderer)) { - // ES2 ANGLE seems to disallow single channel renderability (despite advertising the - // "GL_EXT_texture_rg" extension. // OpenGL 3.0+ (and GL_ARB_framebuffer_object) supports ALPHA8 as renderable. // However, osmesa fails if it is used even when GL_ARB_framebuffer_object is present. // Core profile removes ALPHA8 support, but we should have chosen R8 in that case. |