From 9f63b442344eca60a92cff512c255b540930aa15 Mon Sep 17 00:00:00 2001 From: kkinnunen Date: Mon, 25 Jan 2016 00:31:49 -0800 Subject: [PATCH] Make BGRA8888 renderable on CHROMIUM_framebuffer_mixed_samples Make BGRA8888 renderable on CHROMIUM_framebuffer_mixed_samples. BUG=skia:2992 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1615833002 Review URL: https://codereview.chromium.org/1615833002 --- src/gpu/gl/GrGLCaps.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 4467ef9..350c3e5 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -296,7 +296,8 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, fUsesMixedSamples = ctxInfo.hasExtension("GL_NV_framebuffer_mixed_samples") || ctxInfo.hasExtension("GL_CHROMIUM_framebuffer_mixed_samples"); // Workaround NVIDIA bug related to glInvalidateFramebuffer and mixed samples. - if (fUsesMixedSamples && kNVIDIA_GrGLDriver == ctxInfo.driver()) { + if (fUsesMixedSamples && (kNVIDIA_GrGLDriver == ctxInfo.driver() || + kChromium_GrGLDriver == ctxInfo.driver())) { fDiscardRenderTargetSupport = false; fInvalidateFBType = kNone_InvalidateFBType; } @@ -1209,7 +1210,7 @@ void GrGLCaps::initConfigTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa fConfigTable[kBGRA_8888_GrPixelConfig].fFlags = ConfigInfo::kTextureable_Flag | ConfigInfo::kRenderable_Flag; if (ctxInfo.hasExtension("GL_CHROMIUM_renderbuffer_format_BGRA8888") && - this->usesMSAARenderBuffers()) { + (this->usesMSAARenderBuffers() || this->fMSFBOType == kMixedSamples_MSFBOType)) { fConfigTable[kBGRA_8888_GrPixelConfig].fFlags |= ConfigInfo::kRenderableWithMSAA_Flag; } -- 2.7.4