aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2017-11-18 21:26:17 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-19 03:34:07 +0000
commitb07b06e14819c7bfb9da87dd754aca1239045af4 (patch)
tree8f15f91f2e1f08f343e281a071cea9a698f90d8c
parente90974e69fac3a65051c4d819b56511209c85ecd (diff)
Fix assert in blink chromeos
Bug: skia: Change-Id: I894effdde72a8777e0f943decc327d1c6616a69d Reviewed-on: https://skia-review.googlesource.com/73520 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
-rw-r--r--src/gpu/gl/GrGLCaps.cpp2
1 files changed, 1 insertions, 1 deletions
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 =