Revert "Don't key progams/pipelines on origin."
This reverts commit 943108b0b25d0e13e615dbbdcf712640548d2d0f.
Reason for revert: clockwise GM bad on android.
Original change's description:
> Don't key progams/pipelines on origin.
>
> SkSL language features that are origin sensitive now use a uniform
> to conditionally flip their result rather than generating different
> code.
>
> Previously we would insert a "rt height" uniform if sk_FragCoord needed
> to be flipped. sk_FragCoord,y was implemented as "realFragCoord.y" or
> "rtHeight - realFragCoord.y" depending on SkSL::ProgramSettings::fFlipY.
>
> Now we instead use a two component vector rtFlip and sk_FragCoord.y is
> always "rtFlip.x + rtFlip.y*realFragCoord.y". We configure rtFlip as
> either (0, 1) or (rtHeight, -1). sk_Clockwise and dFdy simiarly use
> rtFlip.y to emit code that always works with either origin.
>
> Bug: skia:12037
>
> Change-Id: I7a09d0caac60a58d72b76645ff31bcabde4086b6
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/414796
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,ethannicholas@google.com
Change-Id: I91cc0d86be216f6c32e453a231de088c991be4b2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:12037
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/425056
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/sksl/codegen/SkSLMetalCodeGenerator.cpp b/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
index 8614d79..99ccb1b 100644
--- a/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
@@ -618,7 +618,11 @@
return true;
}
case k_dFdy_IntrinsicKind: {
- this->write(fRTFlipName + ".y*dfdy");
+ // Flipping Y also negates the Y derivatives.
+ if (fProgram.fConfig->fSettings.fFlipY) {
+ this->write("-");
+ }
+ this->write("dfdy");
this->writeArgumentList(c.arguments());
return true;
}
@@ -1103,12 +1107,13 @@
}
void MetalCodeGenerator::writeFragCoord() {
- SkASSERT(fRTFlipName.length());
- this->write("float4(_fragCoord.x, ");
- this->write(fRTFlipName.c_str());
- this->write(".x + ");
- this->write(fRTFlipName.c_str());
- this->write(".y * _fragCoord.y, 0.0, _fragCoord.w)");
+ if (fRTHeightName.length()) {
+ this->write("float4(_fragCoord.x, ");
+ this->write(fRTHeightName.c_str());
+ this->write(" - _fragCoord.y, 0.0, _fragCoord.w)");
+ } else {
+ this->write("float4(_fragCoord.x, _fragCoord.y, 0.0, _fragCoord.w)");
+ }
}
void MetalCodeGenerator::writeVariableReference(const VariableReference& ref) {
@@ -1136,7 +1141,7 @@
case SK_CLOCKWISE_BUILTIN:
// We'd set the front facing winding in the MTLRenderCommandEncoder to be counter
// clockwise to match Skia convention.
- this->write("(" + fRTFlipName + ".y < 0 ? _frontFacing : !_frontFacing)");
+ this->write(fProgram.fConfig->fSettings.fFlipY ? "_frontFacing" : "(!_frontFacing)");
break;
default:
const Variable& var = *ref.variable();
@@ -1591,9 +1596,7 @@
}
bool MetalCodeGenerator::writeFunctionDeclaration(const FunctionDeclaration& f) {
- fRTFlipName = fProgram.fInputs.fUseFlipRTUniform
- ? "_globals._anonInterface0->" SKSL_RTFLIP_NAME
- : "";
+ fRTHeightName = fProgram.fInputs.fRTHeight ? "_globals._anonInterface0->u_skRTHeight" : "";
const char* separator = "";
if (f.isMain()) {
switch (fProgram.fConfig->fKind) {
@@ -1654,9 +1657,9 @@
}
}
if (fProgram.fConfig->fKind == ProgramKind::kFragment) {
- if (fProgram.fInputs.fUseFlipRTUniform && fInterfaceBlockNameMap.empty()) {
+ if (fProgram.fInputs.fRTHeight && fInterfaceBlockNameMap.empty()) {
this->write(", constant sksl_synthetic_uniforms& _anonInterface0 [[buffer(1)]]");
- fRTFlipName = "_anonInterface0." SKSL_RTFLIP_NAME;
+ fRTHeightName = "_anonInterface0.u_skRTHeight";
}
this->write(", bool _frontFacing [[front_facing]]");
this->write(", float4 _fragCoord [[position]]");
@@ -1781,8 +1784,8 @@
}
fIndentation++;
this->writeFields(structType->fields(), structType->fOffset, &intf);
- if (fProgram.fInputs.fUseFlipRTUniform) {
- this->writeLine("float2 " SKSL_RTFLIP_NAME ";");
+ if (fProgram.fInputs.fRTHeight) {
+ this->writeLine("float u_skRTHeight;");
}
fIndentation--;
this->write("}");
@@ -2162,9 +2165,9 @@
wroteInterfaceBlock = true;
}
}
- if (!wroteInterfaceBlock && fProgram.fInputs.fUseFlipRTUniform) {
+ if (!wroteInterfaceBlock && fProgram.fInputs.fRTHeight) {
this->writeLine("struct sksl_synthetic_uniforms {");
- this->writeLine(" float2 " SKSL_RTFLIP_NAME ";");
+ this->writeLine(" float u_skRTHeight;");
this->writeLine("};");
}
}