commit a04e8e842450e606dd938ddae17857849bd504d4
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 27 12:53:13 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 27 12:53:13 2012 +0000
tree 5378470c55006b5e88dc22959280049c2fe77b5c
parent b7b5d93359fdd3c5b2c48be7c5bbc4c978538af5

Do premul and r/b swap conversions in a custom effect

Review URL: https://codereview.appspot.com/6473060/



git-svn-id: http://skia.googlecode.com/svn/trunk@5284 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLShaderBuilder.cpp

diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp
index 167eb78..2243a7c 100644
--- a/src/gpu/gl/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/GrGLShaderBuilder.cpp
@@ -87,24 +87,12 @@
 }
 
 void GrGLShaderBuilder::computeSwizzle(uint32_t configFlags) {
-   static const uint32_t kMulByAlphaMask =
-        (GrGLProgram::StageDesc::kMulRGBByAlpha_RoundUp_InConfigFlag |
-         GrGLProgram::StageDesc::kMulRGBByAlpha_RoundDown_InConfigFlag);
-
     fSwizzle = "";
-    if (configFlags & GrGLProgram::StageDesc::kSwapRAndB_InConfigFlag) {
-        GrAssert(!(configFlags &
-                   GrGLProgram::StageDesc::kSmearAlpha_InConfigFlag));
-        GrAssert(!(configFlags &
-                   GrGLProgram::StageDesc::kSmearRed_InConfigFlag));
-        fSwizzle = ".bgra";
-    } else if (configFlags & GrGLProgram::StageDesc::kSmearAlpha_InConfigFlag) {
-        GrAssert(!(configFlags & kMulByAlphaMask));
+    if (configFlags & GrGLProgram::StageDesc::kSmearAlpha_InConfigFlag) {
         GrAssert(!(configFlags &
                    GrGLProgram::StageDesc::kSmearRed_InConfigFlag));
         fSwizzle = ".aaaa";
     } else if (configFlags & GrGLProgram::StageDesc::kSmearRed_InConfigFlag) {
-        GrAssert(!(configFlags & kMulByAlphaMask));
         GrAssert(!(configFlags &
                    GrGLProgram::StageDesc::kSmearAlpha_InConfigFlag));
         fSwizzle = ".rrrr";