diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-22 19:57:18 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-11-22 19:57:18 +0000 |
| commit | 15717924509ce4d793a87f194dff25b5ab5f38bd (patch) | |
| tree | a0af9752901278e299f21121dd5a0f752ea7ee06 /src | |
| parent | ffe49f5380dd5062073efeda70f2f91682c828ca (diff) | |
[GPU] Allow kMulRGBByAlpha_InConfigFlag and kSwapRAndB_InConfigFlag to both be set
Review URL: http://codereview.appspot.com/5433049/
git-svn-id: http://skia.googlecode.com/svn/trunk@2733 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrGpuGLShaders.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrGpuGLShaders.cpp b/src/gpu/GrGpuGLShaders.cpp index 5ae6d65118..bae699d6e6 100644 --- a/src/gpu/GrGpuGLShaders.cpp +++ b/src/gpu/GrGpuGLShaders.cpp @@ -1028,7 +1028,7 @@ void GrGpuGLShaders::buildProgram(GrPrimitiveType type, } } if (GrPixelConfigIsUnpremultiplied(texture->config())) { - stage.fInConfigFlags = StageDesc::kMulRGBByAlpha_InConfigFlag; + stage.fInConfigFlags |= StageDesc::kMulRGBByAlpha_InConfigFlag; } if (sampler.getFilter() == GrSamplerState::kConvolution_Filter) { |