diff options
| author |  fmalita <fmalita@google.com> | 2016-09-30 08:05:24 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-30 08:05:24 -0700 |
| commit | d214d6ae69c1dd9ef49fdce8fac699d00bffcdcd (patch) | |
| tree | 96deebd7874fe2960416042011a999455d4f82e2 /src/sksl/ir/SkSLLayout.h | |
| parent | bc34404dc3feb4dac854aa43825646dd01139ccb (diff) | |
Revert of Turned on SkSL->GLSL compiler (patchset #41 id:880001 of https://codereview.chromium.org/2288033003/ )
Reason for revert:
1) Chromium roll failures: https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_rel_ng/builds/307297/steps/screenshot_sync_tests%20on%20NVIDIA%20GPU%20on%20Linux%20%28with%20patch%29%20on%20Linux/logs/stdio
2) G3 roll failures
3) iOS failures: https://uberchromegw.corp.google.com/i/client.skia/builders/Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release/builds/7177/steps/perf_skia%20on%20iOS-9.2/logs/stdio
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
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/2387643003
Diffstat (limited to 'src/sksl/ir/SkSLLayout.h')
| -rw-r--r-- | src/sksl/ir/SkSLLayout.h | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h index 24087d0612..d8dc98096f 100644 --- a/src/sksl/ir/SkSLLayout.h +++ b/src/sksl/ir/SkSLLayout.h @@ -22,20 +22,15 @@ struct Layout { , fIndex(layout.fIndex) , fSet(layout.fSet) , fBuiltin(layout.fBuiltin) - , fOriginUpperLeft(layout.fOriginUpperLeft) - , fOverrideCoverage(layout.fOverrideCoverage) - , fBlendSupportAllEquations(layout.fBlendSupportAllEquations) {} + , fOriginUpperLeft(layout.fOriginUpperLeft) {} - Layout(int location, int binding, int index, int set, int builtin, bool originUpperLeft, - bool overrideCoverage, bool blendSupportAllEquations) + Layout(int location, int binding, int index, int set, int builtin, bool originUpperLeft) : fLocation(location) , fBinding(binding) , fIndex(index) , fSet(set) , fBuiltin(builtin) - , fOriginUpperLeft(originUpperLeft) - , fOverrideCoverage(overrideCoverage) - , fBlendSupportAllEquations(blendSupportAllEquations) {} + , fOriginUpperLeft(originUpperLeft) {} std::string description() const { std::string result; @@ -64,14 +59,6 @@ struct Layout { result += separator + "origin_upper_left"; separator = ", "; } - if (fOverrideCoverage) { - result += separator + "override_coverage"; - separator = ", "; - } - if (fBlendSupportAllEquations) { - result += separator + "blend_support_all_equations"; - separator = ", "; - } if (result.length() > 0) { result = "layout (" + result + ")"; } @@ -79,14 +66,11 @@ struct Layout { } bool operator==(const Layout& other) const { - return fLocation == other.fLocation && - fBinding == other.fBinding && - fIndex == other.fIndex && - fSet == other.fSet && - fBuiltin == other.fBuiltin && - fOriginUpperLeft == other.fOriginUpperLeft && - fOverrideCoverage == other.fOverrideCoverage && - fBlendSupportAllEquations == other.fBlendSupportAllEquations; + return fLocation == other.fLocation && + fBinding == other.fBinding && + fIndex == other.fIndex && + fSet == other.fSet && + fBuiltin == other.fBuiltin; } bool operator!=(const Layout& other) const { @@ -101,8 +85,6 @@ struct Layout { int fSet; int fBuiltin; bool fOriginUpperLeft; - bool fOverrideCoverage; - bool fBlendSupportAllEquations; }; } // namespace |