commit 15717924509ce4d793a87f194dff25b5ab5f38bd
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 22 19:57:18 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Nov 22 19:57:18 2011 +0000
tree a0af9752901278e299f21121dd5a0f752ea7ee06
parent ffe49f5380dd5062073efeda70f2f91682c828ca

[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

src/gpu/GrGpuGLShaders.cpp

diff --git a/src/gpu/GrGpuGLShaders.cpp b/src/gpu/GrGpuGLShaders.cpp
index 5ae6d65..bae699d 100644
--- a/src/gpu/GrGpuGLShaders.cpp
+++ b/src/gpu/GrGpuGLShaders.cpp
@@ -1028,7 +1028,7 @@
                 }
             }
             if (GrPixelConfigIsUnpremultiplied(texture->config())) {
-                stage.fInConfigFlags = StageDesc::kMulRGBByAlpha_InConfigFlag;
+                stage.fInConfigFlags |= StageDesc::kMulRGBByAlpha_InConfigFlag;
             }
 
             if (sampler.getFilter() == GrSamplerState::kConvolution_Filter) {