commit 0cb3b8280b52b7d61c06ef2d62c5e5b1bd34a50d
author Ethan Nicholas <ethannicholas@google.com> Mon May 03 15:12:14 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue May 04 13:08:05 2021 +0000
tree 8da37ac33f7bf4b24bf53cbe81dac9d86faf61d3
parent c17099c171f5e0f677e2722954dd8ea88e471aea

Improved DSLType constructor signatures

Being able to Construct() arbitrary types is necessary for the upcoming
DSLParser.

Change-Id: I2d439b4a1db7a460043efa5f0e9207b6073e9f1f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/403696
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

include/sksl/DSLType.h

diff --git a/include/sksl/DSLType.h b/include/sksl/DSLType.h
index fba8ab9..aeefe82 100644
--- a/include/sksl/DSLType.h
+++ b/include/sksl/DSLType.h
@@ -75,14 +75,14 @@
         : fSkSLType(type) {}
 
     template<typename... Args>
-    static DSLExpression Construct(TypeConstant type, Args&&... args) {
+    static DSLExpression Construct(DSLType type, Args&&... args) {
         SkTArray<DSLExpression> argArray;
         argArray.reserve_back(sizeof...(args));
         CollectArgs(argArray, std::forward<Args>(args)...);
         return Construct(type, std::move(argArray));
     }
 
-    static DSLExpression Construct(TypeConstant type, SkTArray<DSLExpression> argArray);
+    static DSLExpression Construct(DSLType type, SkTArray<DSLExpression> argArray);
 
 private:
     const SkSL::Type& skslType() const;

src/sksl/dsl/DSLType.cpp

diff --git a/src/sksl/dsl/DSLType.cpp b/src/sksl/dsl/DSLType.cpp
index 9c8fa81..4f74101 100644
--- a/src/sksl/dsl/DSLType.cpp
+++ b/src/sksl/dsl/DSLType.cpp
@@ -108,8 +108,8 @@
     }
 }
 
-DSLExpression DSLType::Construct(TypeConstant type, SkTArray<DSLExpression> argArray) {
-    return DSLWriter::Construct(DSLType(type).skslType(), std::move(argArray));
+DSLExpression DSLType::Construct(DSLType type, SkTArray<DSLExpression> argArray) {
+    return DSLWriter::Construct(type.skslType(), std::move(argArray));
 }
 
 DSLType Array(const DSLType& base, int count) {