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/SkSLSPIRVCodeGenerator.h b/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
index 68e3d31..cefdfca 100644
--- a/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
@@ -208,7 +208,7 @@
void writeProgramElement(const ProgramElement& pe, OutputStream& out);
- SpvId writeInterfaceBlock(const InterfaceBlock& intf, bool appendRTFlip = true);
+ SpvId writeInterfaceBlock(const InterfaceBlock& intf, bool appendRTHeight = true);
SpvId writeFunctionStart(const FunctionDeclaration& f, OutputStream& out);
@@ -238,14 +238,6 @@
const std::vector<SpvId>& args, OutputStream& out);
/**
- * Promotes an expression to a vector. If the expression is already a vector with vectorSize
- * columns, returns it unmodified. If the expression is a scalar, either promotes it to a
- * vector (if vectorSize > 1) or returns it unmodified (if vectorSize == 1). Asserts if the
- * expression is already a vector and it does not have vectorSize columns.
- */
- SpvId vectorize(const Expression& expr, int vectorSize, OutputStream& out);
-
- /**
* Given a list of potentially mixed scalars and vectors, promotes the scalars to match the
* size of the vectors and returns the ids of the written expressions. e.g. given (float, vec2),
* returns (vec2(float), vec2). It is an error to use mismatched vector sizes, e.g. (float,
@@ -463,8 +455,6 @@
void writeUniformBuffer(std::shared_ptr<SymbolTable> topLevelSymbolTable);
- void addRTFlipUniform(int offset);
-
const Context& fContext;
const MemoryLayout fDefaultLayout;
@@ -495,7 +485,9 @@
SpvId fCurrentBlock;
std::stack<SpvId> fBreakTarget;
std::stack<SpvId> fContinueTarget;
- bool fWroteRTFlip = false;
+ SpvId fRTHeightStructId = (SpvId) -1;
+ SpvId fRTHeightFieldIndex = (SpvId) -1;
+ SpvStorageClass_ fRTHeightStorageClass;
// holds variables synthesized during output, for lifetime purposes
SymbolTable fSynthetics;
int fSkInCount = 1;