aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/SkSLContext.h
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2016-11-22 09:44:03 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-22 15:31:02 +0000
commit64773e6c9f61fb319f597a8d7dd7ee377d51a43a (patch)
treee8ceb0267585ec660844e85d2869d01cf2e3c855 /src/sksl/SkSLContext.h
parent71fecc32b1b4f71ef3c6467b1f5e0b55c2a12428 (diff)
Add support for input attachments in SkSL spirv
BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5115 Change-Id: I3e03a465a10c9aff62491d0f6e71105d1b650dab Reviewed-on: https://skia-review.googlesource.com/5115 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/sksl/SkSLContext.h')
-rw-r--r--src/sksl/SkSLContext.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
index 9289edeee5..6284c21a9a 100644
--- a/src/sksl/SkSLContext.h
+++ b/src/sksl/SkSLContext.h
@@ -88,6 +88,13 @@ public:
, fImage2D_Type(new Type(SkString("image2D"), SpvDim2D, false, false, false, true))
, fIImage2D_Type(new Type(SkString("iimage2D"), SpvDim2D, false, false, false, true))
+ // FIXME express these as "gsubpassInput" that expand to subpassInput, isubpassInput,
+ // and usubpassInput.
+ , fSubpassInput_Type(new Type(SkString("subpassInput"), SpvDimSubpassData, false, false,
+ false, false))
+ , fSubpassInputMS_Type(new Type(SkString("subpassInputMS"), SpvDimSubpassData, false, false,
+ true, false))
+
// FIXME figure out what we're supposed to do with the gsampler et al. types)
, fGSampler1D_Type(new Type(SkString("$gsampler1D"), static_type(*fSampler1D_Type)))
, fGSampler2D_Type(new Type(SkString("$gsampler2D"), static_type(*fSampler2D_Type)))
@@ -137,7 +144,7 @@ public:
, fDefined_Expression(new Defined(*fInvalid_Type)) {}
static std::vector<const Type*> static_type(const Type& t) {
- return { &t, &t, &t, &t };
+ return { &t, &t, &t, &t };
}
const std::unique_ptr<Type> fInvalid_Type;
@@ -214,6 +221,9 @@ public:
const std::unique_ptr<Type> fImage2D_Type;
const std::unique_ptr<Type> fIImage2D_Type;
+ const std::unique_ptr<Type> fSubpassInput_Type;
+ const std::unique_ptr<Type> fSubpassInputMS_Type;
+
const std::unique_ptr<Type> fGSampler1D_Type;
const std::unique_ptr<Type> fGSampler2D_Type;
const std::unique_ptr<Type> fGSampler3D_Type;