Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: src/sksl/ir/SkSLIndexExpression.h

Issue 2131223002: SkSL performance improvements (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/sksl/ir/SkSLFunctionReference.h ('k') | src/sksl/ir/SkSLIntLiteral.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sksl/ir/SkSLIndexExpression.h
diff --git a/src/sksl/ir/SkSLIndexExpression.h b/src/sksl/ir/SkSLIndexExpression.h
index 538c656153ad42929bb411ef49fd85d215b6e848..f5b0d09c2cbffe428aacb844ed78bb5ce20a0a02 100644
--- a/src/sksl/ir/SkSLIndexExpression.h
+++ b/src/sksl/ir/SkSLIndexExpression.h
@@ -16,21 +16,21 @@ namespace SkSL {
/**
* Given a type, returns the type that will result from extracting an array value from it.
*/
-static std::shared_ptr<Type> index_type(const Type& type) {
+static const Type& index_type(const Context& context, const Type& type) {
if (type.kind() == Type::kMatrix_Kind) {
- if (type.componentType() == kFloat_Type) {
+ if (type.componentType() == *context.fFloat_Type) {
switch (type.columns()) {
- case 2: return kVec2_Type;
- case 3: return kVec3_Type;
- case 4: return kVec4_Type;
+ case 2: return *context.fVec2_Type;
+ case 3: return *context.fVec3_Type;
+ case 4: return *context.fVec4_Type;
default: ASSERT(false);
}
} else {
- ASSERT(type.componentType() == kDouble_Type);
+ ASSERT(type.componentType() == *context.fDouble_Type);
switch (type.columns()) {
- case 2: return kDVec2_Type;
- case 3: return kDVec3_Type;
- case 4: return kDVec4_Type;
+ case 2: return *context.fDVec2_Type;
+ case 3: return *context.fDVec3_Type;
+ case 4: return *context.fDVec4_Type;
default: ASSERT(false);
}
}
@@ -42,11 +42,12 @@ static std::shared_ptr<Type> index_type(const Type& type) {
* An expression which extracts a value from an array or matrix, as in 'm[2]'.
*/
struct IndexExpression : public Expression {
- IndexExpression(std::unique_ptr<Expression> base, std::unique_ptr<Expression> index)
- : INHERITED(base->fPosition, kIndex_Kind, index_type(*base->fType))
+ IndexExpression(const Context& context, std::unique_ptr<Expression> base,
+ std::unique_ptr<Expression> index)
+ : INHERITED(base->fPosition, kIndex_Kind, index_type(context, base->fType))
, fBase(std::move(base))
, fIndex(std::move(index)) {
- ASSERT(fIndex->fType == kInt_Type);
+ ASSERT(fIndex->fType == *context.fInt_Type);
}
std::string description() const override {
« no previous file with comments | « src/sksl/ir/SkSLFunctionReference.h ('k') | src/sksl/ir/SkSLIntLiteral.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698