Revert of Make GrGLConfigConversionEffect work for Imagination and some other GPUs.

src/gpu/effects/GrConfigConversionEffect.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrConfigConversionEffect.h"
 #include "GrContext.h"
 #include "GrTBackendEffectFactory.h"
@@ skipping 19 matching lines @@
                           const TransformedCoordsArray& coords,
                           const TextureSamplerArray& samplers) SK_OVERRIDE {
         builder->fsCodeAppendf("\t\t%s = ", outputColor);
         builder->fsAppendTextureLookup(samplers[0], coords[0].c_str(), coords[0].type());
         builder->fsCodeAppend(";\n");
         if (GrConfigConversionEffect::kNone_PMConversion == fPMConversion) {
             SkASSERT(fSwapRedAndBlue);
             builder->fsCodeAppendf("\t%s = %s.bgra;\n", outputColor, outputColor);
         } else {
             const char* swiz = fSwapRedAndBlue ? "bgr" : "rgb";
-            const char* outputColorH = "outputColorH";
             switch (fPMConversion) {
                 case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion:
                     builder->fsCodeAppendf(
                         "\t\t%s = vec4(ceil(%s.%s * %s.a * 255.0) / 255.0, %s.a);\n",
                         outputColor, outputColor, swiz, outputColor, outputColor);
                     break;
                 case GrConfigConversionEffect::kMulByAlpha_RoundDown_PMConversion:
                     // Add a compensation(0.001) here to avoid the side effect of the floor operation.
                     // In Intel GPUs, the integer value converted from floor(%s.r * 255.0) / 255.0
                     // is less than the integer value converted from  %s.r by 1 when the %s.r is
                     // converted from the integer value 2^n, such as 1, 2, 4, 8, etc.
                     builder->fsCodeAppendf(
                         "\t\t%s = vec4(floor(%s.%s * %s.a * 255.0 + 0.001) / 255.0, %s.a);\n",
                         outputColor, outputColor, swiz, outputColor, outputColor);
                     break;
                 case GrConfigConversionEffect::kDivByAlpha_RoundUp_PMConversion:
                     builder->fsCodeAppendf("\t\t%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(%s.%s / %s.a * 255.0) / 255.0, %s.a);\n",
                         outputColor, outputColor, outputColor, swiz, outputColor, outputColor);
                     break;
                 case GrConfigConversionEffect::kDivByAlpha_RoundDown_PMConversion:
                     builder->fsCodeAppendf("\t\t%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(%s.%s / %s.a * 255.0) / 255.0, %s.a);\n",
                         outputColor, outputColor, outputColor, swiz, outputColor, outputColor);
                     break;
-                case GrConfigConversionEffect::kMulByAlpha_RoundUp_HIGHP_PMConversion:
-                    builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH);
-                    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColorH, outputColor);
-                    builder->fsCodeAppendf(
-                        "\t\t%s = vec4(ceil(%s.%s * %s.a * 255.0) / 255.0, %s.a);\n",
-                        outputColorH, outputColorH, swiz, outputColorH, outputColorH);
-                    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, outputColorH);
-                    break;
-                case GrConfigConversionEffect::kMulByAlpha_RoundDown_HIGHP_PMConversion:
-                    builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH);
-                    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColorH, outputColor);
-                    builder->fsCodeAppendf(
-                        "\t\t%s = vec4(floor(%s.%s * %s.a * 255.0) / 255.0, %s.a);\n",
-                        outputColorH, outputColorH, swiz, outputColorH, outputColorH);
-                    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, outputColorH);
-                    break;
-                case GrConfigConversionEffect::kDivByAlpha_RoundUp_HIGHP_PMConversion:
-                    builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH);
-                    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColorH, outputColor);
-                    builder->fsCodeAppendf("\t\t%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(%s.%s / %s.a * 255.0) / 255.0, %s.a);\n",
-                        outputColorH, outputColorH, outputColorH, swiz, outputColorH, outputColorH);
-                    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, outputColorH);
-                    break;
-                case GrConfigConversionEffect::kDivByAlpha_RoundDown_HIGHP_PMConversion:
-                    builder->fsCodeAppendf("\thighp vec4 %s;\n", outputColorH);
-                    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColorH, outputColor);
-                    builder->fsCodeAppendf("\t\t%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(%s.%s / %s.a * 255.0) / 255.0, %s.a);\n",
-                        outputColorH, outputColorH, outputColorH, swiz, outputColorH, outputColorH);
-                    builder->fsCodeAppendf("\t\t%s = %s;\n", outputColor, outputColorH);
-                    break;
                 default:
                     SkFAIL("Unknown conversion op.");
                     break;
             }
         }
         SkString modulate;
         GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor);
         builder->fsCodeAppend(modulate.c_str());
     }
 
@@ skipping 104 matching lines @@
     }
     desc.fFlags = kNone_GrTextureFlags;
     SkAutoTUnref<GrTexture> dataTex(context->createUncachedTexture(desc, data, 0));
     if (!dataTex.get()) {
         return;
     }
 
     static const PMConversion kConversionRules[][2] = {
         {kDivByAlpha_RoundDown_PMConversion, kMulByAlpha_RoundUp_PMConversion},
         {kDivByAlpha_RoundUp_PMConversion, kMulByAlpha_RoundDown_PMConversion},
-        {kDivByAlpha_RoundDown_HIGHP_PMConversion, kMulByAlpha_RoundUp_HIGHP_PMConversion},
-        {kDivByAlpha_RoundUp_HIGHP_PMConversion, kMulByAlpha_RoundDown_HIGHP_PMConversion},
     };
 
     GrContext::AutoWideOpenIdentityDraw awoid(context, NULL);
 
     bool failed = true;
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(kConversionRules) && failed; ++i) {
         *pmToUPMRule = kConversionRules[i][0];
         *upmToPMRule = kConversionRules[i][1];
 
@@ skipping 71 matching lines @@
             // The PM conversions assume colors are 0..255
             return NULL;
         }
         AutoEffectUnref effect(SkNEW_ARGS(GrConfigConversionEffect, (texture,
                                                                      swapRedAndBlue,
                                                                      pmConversion,
                                                                      matrix)));
         return CreateEffectRef(effect);
     }
 }