diff options
| author |  Brian Osman <brianosman@google.com> | 2017-08-15 09:19:53 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-15 13:41:26 +0000 |
| commit | 72a37bed66c90ff2acb930dc4493dc633f265488 (patch) | |
| tree | ea52ba710b25bfb28b9dce235dceacc44bf1c17c | |
| parent | 5b117eafdf213f57b8873addcd8f558aceb76af8 (diff) | |
Fix string typing in generated code
Bug: skia:
Change-Id: Ifbccc6d6880522177ac7a0ae2183be64a3ebfe50
Reviewed-on: https://skia-review.googlesource.com/34681
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
| -rw-r--r-- | src/effects/GrAlphaThresholdFragmentProcessor.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.cpp | 3 | ||||
| -rw-r--r-- | src/sksl/SkSLCPPCodeGenerator.cpp | 2 | ||||
| -rw-r--r-- | tests/SkSLFPTest.cpp | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.cpp b/src/effects/GrAlphaThresholdFragmentProcessor.cpp index bfd237dbbc..96961cf6e5 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.cpp +++ b/src/effects/GrAlphaThresholdFragmentProcessor.cpp @@ -39,10 +39,8 @@ public: kFragment_GrShaderFlag, kFloat_GrSLType, kDefault_GrSLPrecision, "innerThreshold"); fOuterThresholdVar = args.fUniformHandler->addUniform( kFragment_GrShaderFlag, kFloat_GrSLType, kDefault_GrSLPrecision, "outerThreshold"); - SkString sk_TransformedCoords2D_0 = - fragBuilder->ensureCoords2D(args.fTransformedCoords[0]); - SkString sk_TransformedCoords2D_1 = - fragBuilder->ensureCoords2D(args.fTransformedCoords[1]); + SkString sk_TransformedCoords2D_0 = fragBuilder->ensureCoords2D(args.fTransformedCoords[0]); + SkString sk_TransformedCoords2D_1 = fragBuilder->ensureCoords2D(args.fTransformedCoords[1]); fragBuilder->codeAppendf( "float4 _tmpVar1;float4 color = %stexture(%s, %s).%s%s;\nfloat4 mask_color = " "texture(%s, %s).%s;\nif (mask_color.w < 0.5) {\n if (color.w > %s) {\n " diff --git a/src/gpu/effects/GrSimpleTextureEffect.cpp b/src/gpu/effects/GrSimpleTextureEffect.cpp index 63f41a814d..ed2734b579 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.cpp +++ b/src/gpu/effects/GrSimpleTextureEffect.cpp @@ -24,8 +24,7 @@ public: const GrSimpleTextureEffect& _outer = args.fFp.cast<GrSimpleTextureEffect>(); (void)_outer; fColorSpaceHelper.emitCode(args.fUniformHandler, _outer.colorXform().get()); - SkString sk_TransformedCoords2D_0 = - fragBuilder->ensureCoords2D(args.fTransformedCoords[0]); + SkString sk_TransformedCoords2D_0 = fragBuilder->ensureCoords2D(args.fTransformedCoords[0]); fragBuilder->codeAppendf( "float4 _tmpVar1;%s = %s * %stexture(%s, %s).%s%s;\n", args.fOutputColor, args.fInputColor ? args.fInputColor : "float4(1)", diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp index bc47ff0ce3..17bcf0d11f 100644 --- a/src/sksl/SkSLCPPCodeGenerator.cpp +++ b/src/sksl/SkSLCPPCodeGenerator.cpp @@ -95,7 +95,7 @@ void CPPCodeGenerator::writeIndexExpression(const IndexExpression& i) { String name = "sk_TransformedCoords2D_" + to_string(index); fFormatArgs.push_back(name + ".c_str()"); if (fWrittenTransformedCoords.find(index) == fWrittenTransformedCoords.end()) { - fExtraEmitCodeCode += " SkSL::String " + name + + fExtraEmitCodeCode += " SkString " + name + " = fragBuilder->ensureCoords2D(args.fTransformedCoords[" + to_string(index) + "]);\n"; fWrittenTransformedCoords.insert(index); diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp index 1f983b704f..c3f9468ca8 100644 --- a/tests/SkSLFPTest.cpp +++ b/tests/SkSLFPTest.cpp @@ -382,7 +382,7 @@ DEF_TEST(SkSLFPTransformedCoords, r) { *SkSL::ShaderCapsFactory::Default(), {}, { - "SkSL::String sk_TransformedCoords2D_0 = " + "SkString sk_TransformedCoords2D_0 = " "fragBuilder->ensureCoords2D(args.fTransformedCoords[0]);", "fragBuilder->codeAppendf(\"%s = float4(%s, %s);\\n\", args.fOutputColor, " "sk_TransformedCoords2D_0.c_str(), sk_TransformedCoords2D_0.c_str());" |