diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-05-19 14:11:06 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-19 18:32:52 +0000 |
| commit | d547fb602d3fd970882c3fa39464ec48bc6c4d5d (patch) | |
| tree | a56f0a5c3ed4c98fe3d860475061dec94a3a519d /src/gpu/glsl | |
| parent | ddad85b65e3709840026ec7a9033bb9ba5dbe865 (diff) | |
Comment out lcd assert to make GLPrograms test happy
TBR=bsalomon@google.com
Bug: skia:6661
Change-Id: I944d05c31d3d5511f3c1679c9eb689dbcfbbb109
Reviewed-on: https://skia-review.googlesource.com/17399
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/glsl')
| -rw-r--r-- | src/gpu/glsl/GrGLSLXferProcessor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gpu/glsl/GrGLSLXferProcessor.cpp b/src/gpu/glsl/GrGLSLXferProcessor.cpp index 52656b181c..ba5b5dacae 100644 --- a/src/gpu/glsl/GrGLSLXferProcessor.cpp +++ b/src/gpu/glsl/GrGLSLXferProcessor.cpp @@ -125,7 +125,10 @@ void GrGLSLXferProcessor::DefaultCoverageModulation(GrGLSLXPFragmentBuilder* fra const GrXferProcessor& proc) { if (proc.dstReadUsesMixedSamples()) { if (srcCoverage) { - SkASSERT(!proc.isLCD()); + // TODO: Once we are no longer using legacy mesh ops, it will not be possible to even + // create a mixed sample with lcd so we can uncomment the below assert. In practice + // today this never happens except for GLPrograms test which can make one. skia:6661 + // SkASSERT(!proc.isLCD()); fragBuilder->codeAppendf("%s *= %s;", outColor, srcCoverage); fragBuilder->codeAppendf("%s = %s;", outColorSecondary, srcCoverage); } else { |