From 15717924509ce4d793a87f194dff25b5ab5f38bd Mon Sep 17 00:00:00 2001 From: "bsalomon@google.com" Date: Tue, 22 Nov 2011 19:57:18 +0000 Subject: [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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- cgit v1.2.3