diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2016-11-28 12:03:26 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-28 17:53:44 +0000 |
| commit | 2b3dab62bccdbf6244aef9103e9e739147af8616 (patch) | |
| tree | 989120c1cd65a242045a07ff2e1b4f3b6c9ef521 /src/sksl/SkSLContext.h | |
| parent | 343b6772b6cf4715ec1e1f7f604289c0c852a2a7 (diff) | |
removed textureProj() and legacy texture functions from sksl
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5120
Change-Id: I21b111d54becaca845134376e54a5a7c0a6cd6c8
Reviewed-on: https://skia-review.googlesource.com/5120
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/SkSLContext.h')
| -rw-r--r-- | src/sksl/SkSLContext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h index 6284c21a9a..18de3367bc 100644 --- a/src/sksl/SkSLContext.h +++ b/src/sksl/SkSLContext.h @@ -65,8 +65,9 @@ public: , fSampler3D_Type(new Type(SkString("sampler3D"), SpvDim3D, false, false, false, true)) , fSamplerExternalOES_Type(new Type(SkString("samplerExternalOES"), SpvDim2D, false, false, false, true)) - , fSamplerCube_Type(new Type(SkString("samplerCube"))) - , fSampler2DRect_Type(new Type(SkString("sampler2DRect"))) + , fSamplerCube_Type(new Type(SkString("samplerCube"), SpvDimCube, false, false, false, true)) + , fSampler2DRect_Type(new Type(SkString("sampler2DRect"), SpvDimRect, false, false, false, + true)) , fSampler1DArray_Type(new Type(SkString("sampler1DArray"))) , fSampler2DArray_Type(new Type(SkString("sampler2DArray"))) , fSamplerCubeArray_Type(new Type(SkString("samplerCubeArray"))) |