commit 941e7e2c9567ab1d8a3b2d1b0e3db71ee5eb75c9
author Ethan Nicholas <ethannicholas@google.com> Mon Dec 12 15:33:30 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 13 14:28:53 2016 +0000
tree 7f0ad6c5b2c3772d2c83be545fe04c53044746bd
parent 3dc73f3596d93a89f71b0c7e96d5d63dafeaf378

re-land of added sk_FragCoord support to skslc

BUG=skia:

Change-Id: Ifac1aa39839058787ad1794200c3dbb93c147a69
Reviewed-on: https://skia-review.googlesource.com/5850
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLSPIRVCodeGenerator.h

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h
index 5567ec5..96ff187 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/SkSLSPIRVCodeGenerator.h
@@ -62,18 +62,21 @@
         virtual void store(SpvId value, SkWStream& out) = 0;
     };
 
-    SPIRVCodeGenerator(const Context* context)
-    : fContext(*context)
+    SPIRVCodeGenerator(const Context* context, const Program* program, ErrorReporter* errors,
+                       SkWStream* out)
+    : INHERITED(program, errors, out)
+    , fContext(*context)
     , fDefaultLayout(MemoryLayout::k140_Standard)
     , fCapabilities(1 << SpvCapabilityShader)
     , fIdCount(1)
     , fBoolTrue(0)
     , fBoolFalse(0)
+    , fSetupFragPosition(false)
     , fCurrentBlock(0) {
         this->setupIntrinsics();
     }
 
-    void generateCode(const Program& program, ErrorReporter& errors, SkWStream& out) override;
+    bool generateCode() override;
 
 private:
     enum IntrinsicKind {
@@ -100,7 +103,7 @@
 
     SpvId getPointerType(const Type& type, SpvStorageClass_ storageClass);
 
-    SpvId getPointerType(const Type& type, const MemoryLayout& layout, 
+    SpvId getPointerType(const Type& type, const MemoryLayout& layout,
                          SpvStorageClass_ storageClass);
 
     std::vector<SpvId> getAccessChain(const Expression& expr, SkWStream& out);
@@ -153,11 +156,11 @@
 
     SpvId writeSwizzle(const Swizzle& swizzle, SkWStream& out);
 
-    SpvId writeBinaryOperation(const Type& resultType, const Type& operandType, SpvId lhs, 
-                               SpvId rhs, SpvOp_ ifFloat, SpvOp_ ifInt, SpvOp_ ifUInt, 
+    SpvId writeBinaryOperation(const Type& resultType, const Type& operandType, SpvId lhs,
+                               SpvId rhs, SpvOp_ ifFloat, SpvOp_ ifInt, SpvOp_ ifUInt,
                                SpvOp_ ifBool, SkWStream& out);
 
-    SpvId writeBinaryOperation(const BinaryExpression& expr, SpvOp_ ifFloat, SpvOp_ ifInt, 
+    SpvId writeBinaryOperation(const BinaryExpression& expr, SpvOp_ ifFloat, SpvOp_ ifInt,
                                SpvOp_ ifUInt, SkWStream& out);
 
     SpvId writeBinaryExpression(const BinaryExpression& b, SkWStream& out);
@@ -215,7 +218,7 @@
 
     void writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2, SkWStream& out);
 
-    void writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2, int32_t word3, 
+    void writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2, int32_t word3,
                           SkWStream& out);
 
     void writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2, int32_t word3, int32_t word4,
@@ -231,12 +234,11 @@
                           int32_t word5, int32_t word6, int32_t word7, SkWStream& out);
 
     void writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2, int32_t word3, int32_t word4,
-                          int32_t word5, int32_t word6, int32_t word7, int32_t word8, 
+                          int32_t word5, int32_t word6, int32_t word7, int32_t word8,
                           SkWStream& out);
 
     const Context& fContext;
     const MemoryLayout fDefaultLayout;
-    ErrorReporter* fErrors;
 
     uint64_t fCapabilities;
     SpvId fIdCount;
@@ -250,6 +252,7 @@
     SkDynamicMemoryWStream fCapabilitiesBuffer;
     SkDynamicMemoryWStream fGlobalInitializersBuffer;
     SkDynamicMemoryWStream fConstantBuffer;
+    SkDynamicMemoryWStream fExtraGlobalsBuffer;
     SkDynamicMemoryWStream fExternalFunctionsBuffer;
     SkDynamicMemoryWStream fVariableBuffer;
     SkDynamicMemoryWStream fNameBuffer;
@@ -261,13 +264,18 @@
     std::unordered_map<uint64_t, SpvId> fUIntConstants;
     std::unordered_map<float, SpvId> fFloatConstants;
     std::unordered_map<double, SpvId> fDoubleConstants;
+    bool fSetupFragPosition;
     // label of the current block, or 0 if we are not in a block
     SpvId fCurrentBlock;
     std::stack<SpvId> fBreakTarget;
     std::stack<SpvId> fContinueTarget;
+    SpvId fRTHeightStructId = (SpvId) -1;
+    SpvId fRTHeightFieldIndex = (SpvId) -1;
 
     friend class PointerLValue;
     friend class SwizzleLValue;
+
+    typedef CodeGenerator INHERITED;
 };
 
 }