diff options
author | 2016-10-10 09:18:23 -0700 | |
---|---|---|
committer | 2016-10-10 09:18:23 -0700 | |
commit | 15341a284e78651d2b47b89753044f8d6e7eda0a (patch) | |
tree | 80e2eecf6c4d11f4aa078afcb2181af156934b6f /src/sksl/SkSLContext.h | |
parent | e75c19f6380dd07a19faa39edcdbd75c79c7414d (diff) |
Revert of Turned on SkSL->GLSL compiler (patchset #47 id:1200001 of https://codereview.chromium.org/2288033003/ )
Reason for revert:
Looks like it introduces new static initializers, and it's failing the Chrome roll.
Original issue's description:
> Turned on SkSL->GLSL compiler
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003
>
> Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3
> Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310
> Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89
> Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b
TBR=benjaminwagner@google.com,bsalomon@google.com,egdaniel@google.com,ethannicholas@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2403083002
Diffstat (limited to 'src/sksl/SkSLContext.h')
-rw-r--r-- | src/sksl/SkSLContext.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h index 82c265bbb2..1f124d05eb 100644 --- a/src/sksl/SkSLContext.h +++ b/src/sksl/SkSLContext.h @@ -60,7 +60,6 @@ public: , fSampler1D_Type(new Type("sampler1D", SpvDim1D, false, false, false, true)) , fSampler2D_Type(new Type("sampler2D", SpvDim2D, false, false, false, true)) , fSampler3D_Type(new Type("sampler3D", SpvDim3D, false, false, false, true)) - , fSamplerExternalOES_Type(new Type("samplerExternalOES", SpvDim2D, false, false, false, true)) , fSamplerCube_Type(new Type("samplerCube")) , fSampler2DRect_Type(new Type("sampler2DRect")) , fSampler1DArray_Type(new Type("sampler1DArray")) @@ -170,7 +169,6 @@ public: const std::unique_ptr<Type> fSampler1D_Type; const std::unique_ptr<Type> fSampler2D_Type; const std::unique_ptr<Type> fSampler3D_Type; - const std::unique_ptr<Type> fSamplerExternalOES_Type; const std::unique_ptr<Type> fSamplerCube_Type; const std::unique_ptr<Type> fSampler2DRect_Type; const std::unique_ptr<Type> fSampler1DArray_Type; |