| commit | bf7b620b1e44985b164a8bd68031a7613fe0bb9b | [log] [tgz] |
|---|---|---|
| author | Brian Salomon <bsalomon@google.com> | Fri Nov 11 16:08:03 2016 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Fri Nov 11 21:58:52 2016 +0000 |
| tree | 39c26fc481302f134d6b9079491dcbb59eecb6bf | |
| parent | 06dd5c77a6ca6c484c683f1006a7bb6742f8917e [diff] [blame] |
Revert "Revert "Add integer texture support."" This reverts commit 9c7edb8311409a141b0dc1d5e480c68c629f1997. Fixes ASAN errors GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4736 Change-Id: I1b1dae754d357b01da7169c8e7c59d7d8d8a10f6 Reviewed-on: https://skia-review.googlesource.com/4736 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp index 27fd662..4794759 100644 --- a/src/sksl/SkSLCompiler.cpp +++ b/src/sksl/SkSLCompiler.cpp
@@ -111,6 +111,8 @@ ADD_TYPE(Sampler2DMS); ADD_TYPE(Sampler2DMSArray); + ADD_TYPE(ISampler2D); + ADD_TYPE(GSampler1D); ADD_TYPE(GSampler2D); ADD_TYPE(GSampler3D);