Chromium Code Reviews| Index: src/sksl/SkSLContext.h |
| diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h |
| index e652948499b42e3873f06e6cedf8b6d4db8d95b2..7a0f826479e88c7d8bf5bb299cb955a1da836a4d 100644 |
| --- a/src/sksl/SkSLContext.h |
| +++ b/src/sksl/SkSLContext.h |
| @@ -110,9 +110,12 @@ public: |
| , fGVec2_Type(new Type("$gvec2")) |
| , fGVec3_Type(new Type("$gvec3")) |
| , fGVec4_Type(new Type("$gvec4", static_type(*fVec4_Type))) |
| - , fDVec_Type(new Type("$dvec")) |
| - , fIVec_Type(new Type("$ivec")) |
| - , fUVec_Type(new Type("$uvec")) |
| + , fDVec_Type(new Type("$dvec", { fDVec2_Type.get(), fDVec2_Type.get(), fDVec3_Type.get(), |
|
dogben
2016/10/25 13:56:50
Is it allowed/supported to use a $genType (or $gen
|
| + fDVec4_Type.get() })) |
| + , fIVec_Type(new Type("$ivec", { fIVec2_Type.get(), fIVec2_Type.get(), fIVec3_Type.get(), |
| + fIVec4_Type.get() })) |
| + , fUVec_Type(new Type("$uvec", { fUVec2_Type.get(), fUVec2_Type.get(), fUVec3_Type.get(), |
| + fUVec4_Type.get() })) |
| , fBVec_Type(new Type("$bvec", { fBVec2_Type.get(), fBVec2_Type.get(), fBVec3_Type.get(), |
| fBVec4_Type.get() })) |
| , fInvalid_Type(new Type("<INVALID>")) |