| Index: src/gpu/gl/GrGLGpu.cpp
|
| diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
|
| index 6bcca816162e6683cc30b5ff1a37083f98430ac3..769633453b5690e67edb17d1d83c918022ad8734 100644
|
| --- a/src/gpu/gl/GrGLGpu.cpp
|
| +++ b/src/gpu/gl/GrGLGpu.cpp
|
| @@ -270,7 +270,7 @@ GrPixelConfig GrGLGpu::preferredReadPixelsConfig(GrPixelConfig readConfig,
|
| GrPixelConfig surfaceConfig) const {
|
| if (GR_GL_RGBA_8888_PIXEL_OPS_SLOW && kRGBA_8888_GrPixelConfig == readConfig) {
|
| return kBGRA_8888_GrPixelConfig;
|
| - } else if (this->glContext().isMesa() &&
|
| + } else if (kMesa_GrGLDriver == this->glContext().driver() &&
|
| GrBytesPerPixel(readConfig) == 4 &&
|
| GrPixelConfigSwapRAndB(readConfig) == surfaceConfig) {
|
| // Mesa 3D takes a slow path on when reading back BGRA from an RGBA surface and vice-versa.
|
| @@ -1865,7 +1865,7 @@ void GrGLGpu::flushRenderTarget(GrGLRenderTarget* target, const SkIRect* bound)
|
| // lots of repeated command buffer flushes when the compositor is
|
| // rendering with Ganesh, which is really slow; even too slow for
|
| // Debug mode.
|
| - if (!this->glContext().isChromium()) {
|
| + if (kChromium_GrGLDriver != this->glContext().driver()) {
|
| GrGLenum status;
|
| GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
|
| if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
|
|
|