diff options
| author |  Mike Klein <mtklein@google.com> | 2017-09-08 22:18:58 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-08 22:19:08 +0000 |
| commit | acc8d2e11a7e076cce3a4d0be2f062a2c1f23b54 (patch) | |
| tree | b41b00e551ff1c8f2e7906c7c74e14902a062985 /src/gpu/effects/GrBitmapTextGeoProc.cpp | |
| parent | e1e47b70e0c55265815c6235d14b493e8e75fdf7 (diff) | |
Revert "Revert "Revert "Add multitexture support to text and path shaders"""
This reverts commit 6c251d24cf90a5c4c091bb7b7373e72705f716d2.
Reason for revert: crashes Fuchsia.
Original change's description:
> Revert "Revert "Add multitexture support to text and path shaders""
>
> This does not add additional textures to the atlases, just adds the
> ability to access those textures in the shaders.
>
> Bug: skia:3550
> Change-Id: I552e2c2e4713a5ea68801fdb8e3bab3867e77988
> Reviewed-on: https://skia-review.googlesource.com/44261
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=jvanverth@google.com,robertphillips@google.com
Change-Id: I25cc5f11a1fa76ca7b2cf24920ae3a2a15aac723
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:3550
Reviewed-on: https://skia-review.googlesource.com/44540
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 8013d2e4b8..c2cf8ebc22 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -7,7 +7,6 @@ #include "GrBitmapTextGeoProc.h" -#include "GrAtlasedShaderHelpers.h" #include "GrTexture.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLGeometryProcessor.h" @@ -37,10 +36,12 @@ public: "AtlasSizeInv", &atlasSizeInvName); - GrGLSLVertToFrag uv(kVec2f_GrSLType); - GrGLSLVertToFrag texIdx(kFloat_GrSLType); - append_index_uv_varyings(args, btgp.inTextureCoords()->fName, atlasSizeInvName, - &uv, &texIdx, nullptr); + GrGLSLVertToFrag v(kVec2f_GrSLType); + varyingHandler->addVarying("TextureCoords", &v, kHigh_GrSLPrecision); + vertBuilder->codeAppendf("%s = float2(%s.x, %s.y) * %s;", v.vsOut(), + btgp.inTextureCoords()->fName, + btgp.inTextureCoords()->fName, + atlasSizeInvName); GrGLSLPPFragmentBuilder* fragBuilder = args.fFragBuilder; // Setup pass through color @@ -63,16 +64,18 @@ public: btgp.localMatrix(), args.fFPCoordTransformHandler); - fragBuilder->codeAppend("float4 texColor;"); - append_multitexture_lookup(args, btgp.numTextureSamplers(), - texIdx, uv.fsIn(), "texColor"); - if (btgp.maskFormat() == kARGB_GrMaskFormat) { - // modulate by color - fragBuilder->codeAppendf("%s = %s * texColor;", args.fOutputColor, args.fOutputColor); + fragBuilder->codeAppendf("%s = ", args.fOutputColor); + fragBuilder->appendTextureLookupAndModulate(args.fOutputColor, + args.fTexSamplers[0], + v.fsIn(), + kVec2f_GrSLType); + fragBuilder->codeAppend(";"); fragBuilder->codeAppendf("%s = float4(1);", args.fOutputCoverage); } else { - fragBuilder->codeAppendf("%s = texColor;", args.fOutputCoverage); + fragBuilder->codeAppendf("%s = ", args.fOutputCoverage); + fragBuilder->appendTextureLookup(args.fTexSamplers[0], v.fsIn(), kVec2f_GrSLType); + fragBuilder->codeAppend(";"); } } @@ -86,7 +89,7 @@ public: fColor = btgp.color(); } - SkASSERT(btgp.numTextureSamplers() >= 1); + SkASSERT(btgp.numTextureSamplers() == 1); GrTexture* atlas = btgp.textureSampler(0).peekTexture(); SkASSERT(atlas && SkIsPow2(atlas->width()) && SkIsPow2(atlas->height())); @@ -105,7 +108,6 @@ public: key |= (btgp.usesLocalCoords() && btgp.localMatrix().hasPerspective()) ? 0x1 : 0x0; key |= btgp.maskFormat() << 1; b->add32(key); - b->add32(btgp.numTextureSamplers()); } private: |