diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-06-27 09:56:09 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 14:20:05 +0000 |
commit | ccf59917d3fe7aaf59de714acfbd0596503f324f (patch) | |
tree | cc97719c47276c9dcbf0ec09effd580c4e7450dd /src/sksl/SkSLContext.h | |
parent | c3aef18419c1bb16951370e11758c7ef131fa10b (diff) |
sksl fragment processor support
Bug: skia:
Change-Id: Ia3b0305c2b0c78074303831f628fb01852b90d34
Reviewed-on: https://skia-review.googlesource.com/17843
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/sksl/SkSLContext.h')
-rw-r--r-- | src/sksl/SkSLContext.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h index 53e5ea0954..1155af4817 100644 --- a/src/sksl/SkSLContext.h +++ b/src/sksl/SkSLContext.h @@ -66,8 +66,7 @@ public: , fSamplerExternalOES_Type(new Type(String("samplerExternalOES"), SpvDim2D, false, false, false, true)) , fSamplerCube_Type(new Type(String("samplerCube"), SpvDimCube, false, false, false, true)) - , fSampler2DRect_Type(new Type(String("sampler2DRect"), SpvDimRect, false, false, false, - true)) + , fSampler2DRect_Type(new Type(String("sampler2DRect"), SpvDimRect, false, false, false, true)) , fSampler1DArray_Type(new Type(String("sampler1DArray"))) , fSampler2DArray_Type(new Type(String("sampler2DArray"))) , fSamplerCubeArray_Type(new Type(String("samplerCubeArray"))) @@ -151,6 +150,8 @@ public: , fBVec_Type(new Type(String("$bvec"), { fInvalid_Type.get(), fBVec2_Type.get(), fBVec3_Type.get(), fBVec4_Type.get() })) , fSkCaps_Type(new Type(String("$sk_Caps"))) + , fSkArgs_Type(new Type(String("$sk_Args"))) + , fColorSpaceXform_Type(new Type(String("colorSpaceXform"), *fFloat_Type, 4, 4)) , fDefined_Expression(new Defined(*fInvalid_Type)) {} static std::vector<const Type*> static_type(const Type& t) { @@ -225,7 +226,6 @@ public: const std::unique_ptr<Type> fSampler2DArrayShadow_Type; const std::unique_ptr<Type> fSamplerCubeArrayShadow_Type; - const std::unique_ptr<Type> fISampler2D_Type; const std::unique_ptr<Type> fImage2D_Type; @@ -269,6 +269,8 @@ public: const std::unique_ptr<Type> fBVec_Type; const std::unique_ptr<Type> fSkCaps_Type; + const std::unique_ptr<Type> fSkArgs_Type; + const std::unique_ptr<Type> fColorSpaceXform_Type; // dummy expression used to mark that a variable has a value during dataflow analysis (when it // could have several different values, or the analyzer is otherwise unable to assign it a @@ -281,14 +283,14 @@ private: Defined(const Type& type) : INHERITED(Position(), kDefined_Kind, type) {} - virtual String description() const override { - return String("<defined>"); - } - bool hasSideEffects() const override { return false; } + String description() const override { + return String("<defined>"); + } + typedef Expression INHERITED; }; }; |