X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fgpu%2Feffects%2FGrConfigConversionEffect.cpp;h=4eb7a11c76c234ad890521202768e446849effec;hb=ce02e7175872abde3721df9e5d3ec0ab8384cd8e;hp=f60be2a97009f4b8537f92556df04f753510c682;hpb=1a8ecdfb73a15de600d5779b75d7c4b61863c50b;p=platform%2Fupstream%2FlibSkiaSharp.git diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index f60be2a..4eb7a11 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -7,168 +7,176 @@ #include "GrConfigConversionEffect.h" #include "GrContext.h" -#include "GrTBackendProcessorFactory.h" +#include "GrDrawContext.h" +#include "GrInvariantOutput.h" #include "GrSimpleTextureEffect.h" -#include "gl/GrGLProcessor.h" -#include "gl/builders/GrGLProgramBuilder.h" #include "SkMatrix.h" +#include "glsl/GrGLSLFragmentProcessor.h" +#include "glsl/GrGLSLFragmentShaderBuilder.h" -class GrGLConfigConversionEffect : public GrGLFragmentProcessor { +class GrGLConfigConversionEffect : public GrGLSLFragmentProcessor { public: - GrGLConfigConversionEffect(const GrBackendProcessorFactory& factory, - const GrProcessor& processor) - : INHERITED (factory) { - const GrConfigConversionEffect& configConversionEffect = - processor.cast(); - fSwapRedAndBlue = configConversionEffect.swapsRedAndBlue(); - fPMConversion = configConversionEffect.pmConversion(); - } + void emitCode(EmitArgs& args) override { + const GrConfigConversionEffect& cce = args.fFp.cast(); + const GrSwizzle& swizzle = cce.swizzle(); + GrConfigConversionEffect::PMConversion pmConversion = cce.pmConversion(); - virtual void emitCode(GrGLProgramBuilder* builder, - const GrFragmentProcessor&, - const GrProcessorKey& key, - const char* outputColor, - const char* inputColor, - const TransformedCoordsArray& coords, - const TextureSamplerArray& samplers) SK_OVERRIDE { // Using highp for GLES here in order to avoid some precision issues on specific GPUs. - GrGLShaderVar tmpVar("tmpColor", kVec4f_GrSLType, 0, GrGLShaderVar::kHigh_Precision); + GrGLSLShaderVar tmpVar("tmpColor", kVec4f_GrSLType, 0, kHigh_GrSLPrecision); SkString tmpDecl; - tmpVar.appendDecl(builder->ctxInfo(), &tmpDecl); + tmpVar.appendDecl(args.fGLSLCaps, &tmpDecl); - GrGLFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder(); + GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder; - fsBuilder->codeAppendf("%s;", tmpDecl.c_str()); + fragBuilder->codeAppendf("%s;", tmpDecl.c_str()); - fsBuilder->codeAppendf("%s = ", tmpVar.c_str()); - fsBuilder->appendTextureLookup(samplers[0], coords[0].c_str(), coords[0].getType()); - fsBuilder->codeAppend(";"); + fragBuilder->codeAppendf("%s = ", tmpVar.c_str()); + fragBuilder->appendTextureLookup(args.fTexSamplers[0], args.fTransformedCoords[0].c_str(), + args.fTransformedCoords[0].getType()); + fragBuilder->codeAppend(";"); - if (GrConfigConversionEffect::kNone_PMConversion == fPMConversion) { - SkASSERT(fSwapRedAndBlue); - fsBuilder->codeAppendf("%s = %s.bgra;", outputColor, tmpVar.c_str()); + if (GrConfigConversionEffect::kNone_PMConversion == pmConversion) { + SkASSERT(GrSwizzle::RGBA() != swizzle); + fragBuilder->codeAppendf("%s = %s.%s;", args.fOutputColor, tmpVar.c_str(), + swizzle.c_str()); } else { - const char* swiz = fSwapRedAndBlue ? "bgr" : "rgb"; - switch (fPMConversion) { + switch (pmConversion) { case GrConfigConversionEffect::kMulByAlpha_RoundUp_PMConversion: - fsBuilder->codeAppendf( - "%s = vec4(ceil(%s.%s * %s.a * 255.0) / 255.0, %s.a);", - tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str()); + fragBuilder->codeAppendf( + "%s = vec4(ceil(%s.rgb * %s.a * 255.0) / 255.0, %s.a);", + tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str()); 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. - fsBuilder->codeAppendf( - "%s = vec4(floor(%s.%s * %s.a * 255.0 + 0.001) / 255.0, %s.a);", - tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str()); + fragBuilder->codeAppendf( + "%s = vec4(floor(%s.rgb * %s.a * 255.0 + 0.001) / 255.0, %s.a);", + tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str()); + break; case GrConfigConversionEffect::kDivByAlpha_RoundUp_PMConversion: - fsBuilder->codeAppendf( - "%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(%s.%s / %s.a * 255.0) / 255.0, %s.a);", - tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str()); + fragBuilder->codeAppendf( + "%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(ceil(%s.rgb / %s.a * 255.0) / 255.0, %s.a);", + tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), + tmpVar.c_str()); break; case GrConfigConversionEffect::kDivByAlpha_RoundDown_PMConversion: - fsBuilder->codeAppendf( - "%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(%s.%s / %s.a * 255.0) / 255.0, %s.a);", - tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), swiz, tmpVar.c_str(), tmpVar.c_str()); + fragBuilder->codeAppendf( + "%s = %s.a <= 0.0 ? vec4(0,0,0,0) : vec4(floor(%s.rgb / %s.a * 255.0) / 255.0, %s.a);", + tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), tmpVar.c_str(), + tmpVar.c_str()); break; default: SkFAIL("Unknown conversion op."); break; } - fsBuilder->codeAppendf("%s = %s;", outputColor, tmpVar.c_str()); + fragBuilder->codeAppendf("%s = %s.%s;", args.fOutputColor, tmpVar.c_str(), + swizzle.c_str()); } SkString modulate; - GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor); - fsBuilder->codeAppend(modulate.c_str()); + GrGLSLMulVarBy4f(&modulate, args.fOutputColor, args.fInputColor); + fragBuilder->codeAppend(modulate.c_str()); } - static inline void GenKey(const GrProcessor& processor, const GrGLCaps&, + static inline void GenKey(const GrProcessor& processor, const GrGLSLCaps&, GrProcessorKeyBuilder* b) { - const GrConfigConversionEffect& conv = processor.cast(); - uint32_t key = (conv.swapsRedAndBlue() ? 0 : 1) | (conv.pmConversion() << 1); + const GrConfigConversionEffect& cce = processor.cast(); + uint32_t key = (cce.swizzle().asKey()) | (cce.pmConversion() << 16); b->add32(key); } private: - bool fSwapRedAndBlue; - GrConfigConversionEffect::PMConversion fPMConversion; - - typedef GrGLFragmentProcessor INHERITED; + typedef GrGLSLFragmentProcessor INHERITED; }; /////////////////////////////////////////////////////////////////////////////// GrConfigConversionEffect::GrConfigConversionEffect(GrTexture* texture, - bool swapRedAndBlue, + const GrSwizzle& swizzle, PMConversion pmConversion, const SkMatrix& matrix) - : GrSingleTextureEffect(texture, matrix) - , fSwapRedAndBlue(swapRedAndBlue) + : INHERITED(texture, nullptr, matrix) + , fSwizzle(swizzle) , fPMConversion(pmConversion) { - SkASSERT(kRGBA_8888_GrPixelConfig == texture->config() || - kBGRA_8888_GrPixelConfig == texture->config()); + this->initClassID(); + // We expect to get here with non-BGRA/RGBA only if we're doing not doing a premul/unpremul + // conversion. + SkASSERT((kRGBA_8888_GrPixelConfig == texture->config() || + kBGRA_8888_GrPixelConfig == texture->config()) || + kNone_PMConversion == pmConversion); // Why did we pollute our texture cache instead of using a GrSingleTextureEffect? - SkASSERT(swapRedAndBlue || kNone_PMConversion != pmConversion); + SkASSERT(swizzle != GrSwizzle::RGBA() || kNone_PMConversion != pmConversion); } -const GrBackendFragmentProcessorFactory& GrConfigConversionEffect::getFactory() const { - return GrTBackendFragmentProcessorFactory::getInstance(); -} - -bool GrConfigConversionEffect::onIsEqual(const GrProcessor& s) const { +bool GrConfigConversionEffect::onIsEqual(const GrFragmentProcessor& s) const { const GrConfigConversionEffect& other = s.cast(); - return this->texture(0) == s.texture(0) && - other.fSwapRedAndBlue == fSwapRedAndBlue && + return other.fSwizzle == fSwizzle && other.fPMConversion == fPMConversion; } -void GrConfigConversionEffect::onComputeInvariantOutput(InvariantOutput* inout) const { +void GrConfigConversionEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { this->updateInvariantOutputForModulation(inout); - inout->fIsSingleComponent = false; } /////////////////////////////////////////////////////////////////////////////// GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrConfigConversionEffect); -GrFragmentProcessor* GrConfigConversionEffect::TestCreate(SkRandom* random, - GrContext*, - const GrDrawTargetCaps&, - GrTexture* textures[]) { - PMConversion pmConv = static_cast(random->nextULessThan(kPMConversionCnt)); - bool swapRB; - if (kNone_PMConversion == pmConv) { - swapRB = true; - } else { - swapRB = random->nextBool(); - } - return SkNEW_ARGS(GrConfigConversionEffect, - (textures[GrProcessorUnitTest::kSkiaPMTextureIdx], - swapRB, - pmConv, - GrProcessorUnitTest::TestMatrix(random))); +#if !defined(__clang__) && _MSC_FULL_VER >= 190024213 +// Work around VS 2015 Update 3 optimizer bug that causes internal compiler error +//https://connect.microsoft.com/VisualStudio/feedback/details/3100520/internal-compiler-error +#pragma optimize("t", off) +#endif + +sk_sp GrConfigConversionEffect::TestCreate(GrProcessorTestData* d) { + PMConversion pmConv = static_cast(d->fRandom->nextULessThan(kPMConversionCnt)); + GrSwizzle swizzle; + do { + swizzle = GrSwizzle::CreateRandom(d->fRandom); + } while (pmConv == kNone_PMConversion && swizzle == GrSwizzle::RGBA()); + return sk_sp( + new GrConfigConversionEffect(d->fTextures[GrProcessorUnitTest::kSkiaPMTextureIdx], + swizzle, pmConv, GrTest::TestMatrix(d->fRandom))); } +#if !defined(__clang__) && _MSC_FULL_VER >= 190024213 +// Restore optimization settings. +#pragma optimize("", on) +#endif + /////////////////////////////////////////////////////////////////////////////// + +void GrConfigConversionEffect::onGetGLSLProcessorKey(const GrGLSLCaps& caps, + GrProcessorKeyBuilder* b) const { + GrGLConfigConversionEffect::GenKey(*this, caps, b); +} + +GrGLSLFragmentProcessor* GrConfigConversionEffect::onCreateGLSLInstance() const { + return new GrGLConfigConversionEffect(); +} + + + void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context, PMConversion* pmToUPMRule, PMConversion* upmToPMRule) { *pmToUPMRule = kNone_PMConversion; *upmToPMRule = kNone_PMConversion; - SkAutoTMalloc data(256 * 256 * 3); + static constexpr int kSize = 256; + static constexpr GrPixelConfig kConfig = kRGBA_8888_GrPixelConfig; + SkAutoTMalloc data(kSize * kSize * 3); uint32_t* srcData = data.get(); - uint32_t* firstRead = data.get() + 256 * 256; - uint32_t* secondRead = data.get() + 2 * 256 * 256; + uint32_t* firstRead = data.get() + kSize * kSize; + uint32_t* secondRead = data.get() + 2 * kSize * kSize; // Fill with every possible premultiplied A, color channel value. There will be 256-y duplicate // values in row y. We set r,g, and b to the same value since they are handled identically. - for (int y = 0; y < 256; ++y) { - for (int x = 0; x < 256; ++x) { - uint8_t* color = reinterpret_cast(&srcData[256*y + x]); + for (int y = 0; y < kSize; ++y) { + for (int x = 0; x < kSize; ++x) { + uint8_t* color = reinterpret_cast(&srcData[kSize*y + x]); color[3] = y; color[2] = SkTMin(x, y); color[1] = SkTMin(x, y); @@ -176,23 +184,19 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context } } - GrTextureDesc desc; - desc.fFlags = kRenderTarget_GrTextureFlagBit | - kNoStencil_GrTextureFlagBit; - desc.fWidth = 256; - desc.fHeight = 256; - desc.fConfig = kRGBA_8888_GrPixelConfig; - - SkAutoTUnref readTex(context->createUncachedTexture(desc, NULL, 0)); - if (!readTex.get()) { - return; - } - SkAutoTUnref tempTex(context->createUncachedTexture(desc, NULL, 0)); - if (!tempTex.get()) { + sk_sp readDC(context->makeDrawContext(SkBackingFit::kExact, kSize, kSize, + kConfig, nullptr)); + sk_sp tempDC(context->makeDrawContext(SkBackingFit::kExact, kSize, kSize, + kConfig, nullptr)); + if (!readDC || !tempDC) { return; } - desc.fFlags = kNone_GrTextureFlags; - SkAutoTUnref dataTex(context->createUncachedTexture(desc, data, 0)); + GrSurfaceDesc desc; + desc.fWidth = kSize; + desc.fHeight = kSize; + desc.fConfig = kConfig; + SkAutoTUnref dataTex(context->textureProvider()->createTexture( + desc, SkBudgeted::kYes, data, 0)); if (!dataTex.get()) { return; } @@ -202,53 +206,51 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context {kDivByAlpha_RoundUp_PMConversion, kMulByAlpha_RoundDown_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]; - static const SkRect kDstRect = SkRect::MakeWH(SkIntToScalar(256), SkIntToScalar(256)); - static const SkRect kSrcRect = SkRect::MakeWH(SK_Scalar1, SK_Scalar1); + static const SkRect kDstRect = SkRect::MakeIWH(kSize, kSize); + static const SkRect kSrcRect = SkRect::MakeIWH(1, 1); // We do a PM->UPM draw from dataTex to readTex and read the data. Then we do a UPM->PM draw // from readTex to tempTex followed by a PM->UPM draw to readTex and finally read the data. // We then verify that two reads produced the same values. - SkAutoTUnref pmToUPM1( - SkNEW_ARGS(GrConfigConversionEffect, - (dataTex, false, *pmToUPMRule, SkMatrix::I()))); - SkAutoTUnref upmToPM( - SkNEW_ARGS(GrConfigConversionEffect, - (readTex, false, *upmToPMRule, SkMatrix::I()))); - SkAutoTUnref pmToUPM2( - SkNEW_ARGS(GrConfigConversionEffect, - (tempTex, false, *pmToUPMRule, SkMatrix::I()))); - - context->setRenderTarget(readTex->asRenderTarget()); GrPaint paint1; - paint1.addColorProcessor(pmToUPM1); - context->drawRectToRect(paint1, kDstRect, kSrcRect); + GrPaint paint2; + GrPaint paint3; + sk_sp pmToUPM1(new GrConfigConversionEffect( + dataTex, GrSwizzle::RGBA(), *pmToUPMRule, SkMatrix::I())); + sk_sp upmToPM(new GrConfigConversionEffect( + readDC->asTexture().get(), GrSwizzle::RGBA(), *upmToPMRule, SkMatrix::I())); + sk_sp pmToUPM2(new GrConfigConversionEffect( + tempDC->asTexture().get(), GrSwizzle::RGBA(), *pmToUPMRule, SkMatrix::I())); - readTex->readPixels(0, 0, 256, 256, kRGBA_8888_GrPixelConfig, firstRead); + paint1.addColorFragmentProcessor(std::move(pmToUPM1)); + paint1.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); - context->setRenderTarget(tempTex->asRenderTarget()); - GrPaint paint2; - paint2.addColorProcessor(upmToPM); - context->drawRectToRect(paint2, kDstRect, kSrcRect); - context->setRenderTarget(readTex->asRenderTarget()); + readDC->fillRectToRect(GrNoClip(), paint1, SkMatrix::I(), kDstRect, kSrcRect); - GrPaint paint3; - paint3.addColorProcessor(pmToUPM2); - context->drawRectToRect(paint3, kDstRect, kSrcRect); + readDC->asTexture()->readPixels(0, 0, kSize, kSize, kConfig, firstRead); + + paint2.addColorFragmentProcessor(std::move(upmToPM)); + paint2.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); + + tempDC->fillRectToRect(GrNoClip(), paint2, SkMatrix::I(), kDstRect, kSrcRect); + + paint3.addColorFragmentProcessor(std::move(pmToUPM2)); + paint3.setPorterDuffXPFactory(SkXfermode::kSrc_Mode); + + readDC->fillRectToRect(GrNoClip(), paint3, SkMatrix::I(), kDstRect, kSrcRect); - readTex->readPixels(0, 0, 256, 256, kRGBA_8888_GrPixelConfig, secondRead); + readDC->asTexture()->readPixels(0, 0, kSize, kSize, kConfig, secondRead); failed = false; - for (int y = 0; y < 256 && !failed; ++y) { + for (int y = 0; y < kSize && !failed; ++y) { for (int x = 0; x <= y; ++x) { - if (firstRead[256 * y + x] != secondRead[256 * y + x]) { + if (firstRead[kSize * y + x] != secondRead[kSize * y + x]) { failed = true; break; } @@ -261,25 +263,23 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context } } -const GrFragmentProcessor* GrConfigConversionEffect::Create(GrTexture* texture, - bool swapRedAndBlue, - PMConversion pmConversion, - const SkMatrix& matrix) { - if (!swapRedAndBlue && kNone_PMConversion == pmConversion) { +sk_sp GrConfigConversionEffect::Make(GrTexture* texture, + const GrSwizzle& swizzle, + PMConversion pmConversion, + const SkMatrix& matrix) { + if (swizzle == GrSwizzle::RGBA() && kNone_PMConversion == pmConversion) { // If we returned a GrConfigConversionEffect that was equivalent to a GrSimpleTextureEffect // then we may pollute our texture cache with redundant shaders. So in the case that no // conversions were requested we instead return a GrSimpleTextureEffect. - return GrSimpleTextureEffect::Create(texture, matrix); + return GrSimpleTextureEffect::Make(texture, nullptr, matrix); } else { if (kRGBA_8888_GrPixelConfig != texture->config() && kBGRA_8888_GrPixelConfig != texture->config() && kNone_PMConversion != pmConversion) { // The PM conversions assume colors are 0..255 - return NULL; + return nullptr; } - return SkNEW_ARGS(GrConfigConversionEffect, (texture, - swapRedAndBlue, - pmConversion, - matrix)); + return sk_sp( + new GrConfigConversionEffect(texture, swizzle, pmConversion, matrix)); } }