diff options
| author |  mtklein <mtklein@google.com> | 2016-10-10 19:41:32 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-10-10 19:41:32 -0700 |
| commit | 4824cf4c1ef991fe9b0dcd1536e83b37907d3fcf (patch) | |
| tree | 050073d53e03fc622e69b0df6efde0c9477de932 /src/sksl/ir/SkSLProgram.h | |
| parent | 9d2b0fea05a0d33a87027d486a3db4b5bba46bd0 (diff) | |
Revert of Turned on SkSL->GLSL compiler (patchset #48 id:1220001 of https://codereview.chromium.org/2288033003/ )
Reason for revert:
https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/26798
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
> Committed: https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c
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/2408053002
Diffstat (limited to 'src/sksl/ir/SkSLProgram.h')
| -rw-r--r-- | src/sksl/ir/SkSLProgram.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/sksl/ir/SkSLProgram.h b/src/sksl/ir/SkSLProgram.h index 8393341269..205db6e932 100644 --- a/src/sksl/ir/SkSLProgram.h +++ b/src/sksl/ir/SkSLProgram.h @@ -11,7 +11,6 @@ #include <vector> #include <memory> -#include "SkSLModifiers.h" #include "SkSLProgramElement.h" #include "SkSLSymbolTable.h" @@ -26,18 +25,14 @@ struct Program { kVertex_Kind }; - Program(Kind kind, - Modifiers::Flag defaultPrecision, - std::vector<std::unique_ptr<ProgramElement>> elements, + Program(Kind kind, std::vector<std::unique_ptr<ProgramElement>> elements, std::shared_ptr<SymbolTable> symbols) : fKind(kind) - , fDefaultPrecision(defaultPrecision) , fElements(std::move(elements)) , fSymbols(symbols) {} Kind fKind; - // FIXME handle different types; currently it assumes this is for floats - Modifiers::Flag fDefaultPrecision; + std::vector<std::unique_ptr<ProgramElement>> fElements; std::shared_ptr<SymbolTable> fSymbols; }; |