From d214d6ae69c1dd9ef49fdce8fac699d00bffcdcd Mon Sep 17 00:00:00 2001 From: fmalita Date: Fri, 30 Sep 2016 08:05:24 -0700 Subject: 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 --- src/sksl/ir/SkSLIndexExpression.h | 4 ++-- src/sksl/ir/SkSLIntLiteral.h | 4 ++-- src/sksl/ir/SkSLLayout.h | 34 ++++++++----------------------- src/sksl/ir/SkSLModifiersDeclaration.h | 37 ---------------------------------- src/sksl/ir/SkSLProgram.h | 9 ++------- src/sksl/ir/SkSLProgramElement.h | 3 +-- 6 files changed, 15 insertions(+), 76 deletions(-) delete mode 100644 src/sksl/ir/SkSLModifiersDeclaration.h (limited to 'src/sksl/ir') diff --git a/src/sksl/ir/SkSLIndexExpression.h b/src/sksl/ir/SkSLIndexExpression.h index 319e06f97d..f5b0d09c2c 100644 --- a/src/sksl/ir/SkSLIndexExpression.h +++ b/src/sksl/ir/SkSLIndexExpression.h @@ -19,7 +19,7 @@ namespace SkSL { static const Type& index_type(const Context& context, const Type& type) { if (type.kind() == Type::kMatrix_Kind) { if (type.componentType() == *context.fFloat_Type) { - switch (type.rows()) { + switch (type.columns()) { case 2: return *context.fVec2_Type; case 3: return *context.fVec3_Type; case 4: return *context.fVec4_Type; @@ -47,7 +47,7 @@ struct IndexExpression : public Expression { : INHERITED(base->fPosition, kIndex_Kind, index_type(context, base->fType)) , fBase(std::move(base)) , fIndex(std::move(index)) { - ASSERT(fIndex->fType == *context.fInt_Type || fIndex->fType == *context.fUInt_Type); + ASSERT(fIndex->fType == *context.fInt_Type); } std::string description() const override { diff --git a/src/sksl/ir/SkSLIntLiteral.h b/src/sksl/ir/SkSLIntLiteral.h index 8921c283b5..2bc565712e 100644 --- a/src/sksl/ir/SkSLIntLiteral.h +++ b/src/sksl/ir/SkSLIntLiteral.h @@ -18,8 +18,8 @@ namespace SkSL { struct IntLiteral : public Expression { // FIXME: we will need to revisit this if/when we add full support for both signed and unsigned // 64-bit integers, but for right now an int64_t will hold every value we care about - IntLiteral(const Context& context, Position position, int64_t value, const Type* type = nullptr) - : INHERITED(position, kIntLiteral_Kind, type ? *type : *context.fInt_Type) + IntLiteral(const Context& context, Position position, int64_t value) + : INHERITED(position, kIntLiteral_Kind, *context.fInt_Type) , fValue(value) {} virtual std::string description() const override { 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 diff --git a/src/sksl/ir/SkSLModifiersDeclaration.h b/src/sksl/ir/SkSLModifiersDeclaration.h deleted file mode 100644 index 0066fab877..0000000000 --- a/src/sksl/ir/SkSLModifiersDeclaration.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2016 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SKSL_MODIFIERDECLARATION -#define SKSL_MODIFIERDECLARATION - -#include "SkSLProgramElement.h" -#include "SkSLModifiers.h" - -namespace SkSL { - -/** - * A declaration that consists only of modifiers, e.g.: - * - * layout(blend_support_all_equations) out; - */ -struct ModifiersDeclaration : public ProgramElement { - ModifiersDeclaration(Modifiers modifiers) - : INHERITED(Position(), kModifiers_Kind) - , fModifiers(modifiers) {} - - std::string description() const { - return fModifiers.description() + ";"; - } - - Modifiers fModifiers; - - typedef ProgramElement INHERITED; -}; - -} // namespace - -#endif diff --git a/src/sksl/ir/SkSLProgram.h b/src/sksl/ir/SkSLProgram.h index 3a842e9577..205db6e932 100644 --- a/src/sksl/ir/SkSLProgram.h +++ b/src/sksl/ir/SkSLProgram.h @@ -11,7 +11,6 @@ #include #include -#include "SkSLModifiers.h" #include "SkSLProgramElement.h" #include "SkSLSymbolTable.h" @@ -26,20 +25,16 @@ struct Program { kVertex_Kind }; - Program(Kind kind, - Modifiers::Flag defaultPrecision, - std::vector> elements, + Program(Kind kind, std::vector> elements, std::shared_ptr symbols) : fKind(kind) - , fDefaultPrecision(defaultPrecision) , fElements(std::move(elements)) , fSymbols(symbols) {} Kind fKind; - Modifiers::Flag fDefaultPrecision; + std::vector> fElements; std::shared_ptr fSymbols; - // FIXME handle different types; currently it assumes this is for floats }; } // namespace diff --git a/src/sksl/ir/SkSLProgramElement.h b/src/sksl/ir/SkSLProgramElement.h index 2f1ce77199..44fc340667 100644 --- a/src/sksl/ir/SkSLProgramElement.h +++ b/src/sksl/ir/SkSLProgramElement.h @@ -20,8 +20,7 @@ struct ProgramElement : public IRNode { kVar_Kind, kFunction_Kind, kInterfaceBlock_Kind, - kExtension_Kind, - kModifiers_Kind + kExtension_Kind }; ProgramElement(Position position, Kind kind) -- cgit v1.2.3