From b07b06e14819c7bfb9da87dd754aca1239045af4 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Sat, 18 Nov 2017 21:26:17 -0500 Subject: Fix assert in blink chromeos Bug: skia: Change-Id: I894effdde72a8777e0f943decc327d1c6616a69d Reviewed-on: https://skia-review.googlesource.com/73520 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- src/gpu/gl/GrGLCaps.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/gl/GrGLCaps.cpp') diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index a41bee0452..29cd0d8865 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -2076,7 +2076,7 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, // Gallium llvmpipe renderer on ES 3.0 does not have R8 so we use Alpha for // kAlpha_8_GrPixelConfig. Alpha8 is not a valid signed internal format so we must use the base // internal format for that config when doing TexImage calls. - if(kGalliumLLVM_GrGLRenderer == ctxInfo.renderer()) { + if(kGalliumLLVM_GrGLRenderer == ctxInfo.renderer() && !this->textureRedSupport()) { SkASSERT(fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fBaseInternalFormat == fConfigTable[kAlpha_8_as_Alpha_GrPixelConfig].fFormats.fBaseInternalFormat); fConfigTable[kAlpha_8_GrPixelConfig].fFormats.fInternalFormatTexImage = -- cgit v1.2.3