AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sort SkSL gencode enums by value, not name.

Browse Source 
Change-Id: Iff707ae968b84609acde89ba94dec7a5d53c7525
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328576
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
John Stiles 2020-10-20 10:33:56 -04:00 committed by Skia Commit-Bot
parent 3ed7cb5a8b
commit 727f0cd54a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/gradients/generated/GrTwoPointConicalGradientLayout.h
View File

@ -22,7 +22,7 @@
class GrTwoPointConicalGradientLayout : public GrFragmentProcessor {
public:
enum class Type { kFocal = 2, kRadial = 0, kStrip = 1 };
enum class Type { kRadial = 0, kStrip = 1, kFocal = 2 };
static std::unique_ptr<GrFragmentProcessor> Make(const SkTwoPointConicalGradient& gradient,
const GrFPArgs& args);

12
src/sksl/ir/SkSLEnum.h
View File

@ -54,11 +54,9 @@ public:
sortedSymbols.push_back(symbol);
});
std::sort(sortedSymbols.begin(), sortedSymbols.end(),
[](const Symbol* a, const Symbol* b) { return a->name() < b->name(); });
for (const auto& s : sortedSymbols) {
const Expression& initialValue = *s->as<Variable>().initialValue();
result += separator + " " + s->name() + " = " +
to_string(initialValue.as<IntLiteral>().value());
[](const Symbol* a, const Symbol* b) { return EnumValue(a) < EnumValue(b); });
for (const Symbol* s : sortedSymbols) {
result += separator + " " + s->name() + " = " + to_string(EnumValue(s));
separator = ",\n";
}
result += "\n};";
@ -70,6 +68,10 @@ public:
}
private:
static int EnumValue(const Symbol* symbol) {
return symbol->as<Variable>().initialValue()->as<IntLiteral>().value();
}
using INHERITED = ProgramElement;
};