diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-28 13:46:42 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-28 13:46:42 +0000 |
| commit | b8eb2e89edf914caf5479baeffcb670d3e93f496 (patch) | |
| tree | 328527b349cf6cc24c07be4f466ebe35a34c230f /src/effects/SkBlendImageFilter.cpp | |
| parent | 51c81123afbf9a09fda43ca2d287fcf4f5593e9c (diff) | |
Make GrGLShaderBuilder::TextureSampler extract only required info from GrTextureAccess.
This will make it possible to init a TextureSampler without a texture or a specific config.
Also unify two separate bitfields of color components in GPU code.
Review URL: https://codereview.chromium.org/13121002
git-svn-id: http://skia.googlecode.com/svn/trunk@8428 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkBlendImageFilter.cpp')
| -rw-r--r-- | src/effects/SkBlendImageFilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp index 1c85fe5f29..330e87d76d 100644 --- a/src/effects/SkBlendImageFilter.cpp +++ b/src/effects/SkBlendImageFilter.cpp @@ -215,7 +215,7 @@ void GrBlendEffect::getConstantColorComponents(GrColor* color, uint32_t* validFl // communicate this.) if (GrPixelConfigIsOpaque(fForegroundAccess.getTexture()->config()) || GrPixelConfigIsOpaque(fBackgroundAccess.getTexture()->config())) { - *validFlags = kA_ValidComponentFlag; + *validFlags = kA_GrColorComponentFlag; *color = GrColorPackRGBA(0, 0, 0, 0xff); } else { *validFlags = 0; |