diff options
author | Brian Salomon <bsalomon@google.com> | 2016-11-15 19:09:52 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-16 00:48:35 +0000 |
commit | bd85a105ba7b3ee2008d20fb9281bfb47325ad0e (patch) | |
tree | 6a19f708a7a164dd9662aad528490d23d62def3b /src/sksl/SkSLContext.h | |
parent | dabc91bc0f42a9484b6025ddc68fa958455fb53c (diff) |
Add support for image load to SkSL
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4865
Change-Id: I4647e6b255946ced2b1b8cb05e62f0f5a8ad28b6
Reviewed-on: https://skia-review.googlesource.com/4865
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLContext.h')
-rw-r--r-- | src/sksl/SkSLContext.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h index 80ad7fb8f4..a42a4cc855 100644 --- a/src/sksl/SkSLContext.h +++ b/src/sksl/SkSLContext.h @@ -78,8 +78,14 @@ public: , fSampler1DArrayShadow_Type(new Type("sampler1DArrayShadow")) , fSampler2DArrayShadow_Type(new Type("sampler2DArrayShadow")) , fSamplerCubeArrayShadow_Type(new Type("samplerCubeArrayShadow")) + // Related to below FIXME, gsampler*s don't currently expand to cover integer case. , fISampler2D_Type(new Type("isampler2D", SpvDim2D, false, false, false, true)) + + // FIXME express these as "gimage2D" that expand to image2D, iimage2D, and uimage2D. + , fImage2D_Type(new Type("image2D", SpvDim2D, false, false, false, true)) + , fIImage2D_Type(new Type("iimage2D", SpvDim2D, false, false, false, true)) + // FIXME figure out what we're supposed to do with the gsampler et al. types) , fGSampler1D_Type(new Type("$gsampler1D", static_type(*fSampler1D_Type))) , fGSampler2D_Type(new Type("$gsampler2D", static_type(*fSampler2D_Type))) @@ -195,8 +201,12 @@ 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; + const std::unique_ptr<Type> fIImage2D_Type; + const std::unique_ptr<Type> fGSampler1D_Type; const std::unique_ptr<Type> fGSampler2D_Type; const std::unique_ptr<Type> fGSampler3D_Type; |