re-land of switched skslc from std::string to SkString
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5084
Change-Id: Ib21c30afc0d8483392b417e660b7fecfcc30e617
Reviewed-on: https://skia-review.googlesource.com/5084
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
index a42a4cc..05e08f2 100644
--- a/src/sksl/SkSLContext.h
+++ b/src/sksl/SkSLContext.h
@@ -19,114 +19,120 @@
class Context {
public:
Context()
- : fInvalid_Type(new Type("<INVALID>"))
- , fVoid_Type(new Type("void"))
- , fDouble_Type(new Type("double", true))
- , fDVec2_Type(new Type("dvec2", *fDouble_Type, 2))
- , fDVec3_Type(new Type("dvec3", *fDouble_Type, 3))
- , fDVec4_Type(new Type("dvec4", *fDouble_Type, 4))
- , fFloat_Type(new Type("float", true, { fDouble_Type.get() }))
- , fVec2_Type(new Type("vec2", *fFloat_Type, 2))
- , fVec3_Type(new Type("vec3", *fFloat_Type, 3))
- , fVec4_Type(new Type("vec4", *fFloat_Type, 4))
- , fUInt_Type(new Type("uint", true, { fFloat_Type.get(), fDouble_Type.get() }))
- , fUVec2_Type(new Type("uvec2", *fUInt_Type, 2))
- , fUVec3_Type(new Type("uvec3", *fUInt_Type, 3))
- , fUVec4_Type(new Type("uvec4", *fUInt_Type, 4))
- , fInt_Type(new Type("int", true, { fUInt_Type.get(), fFloat_Type.get(), fDouble_Type.get() }))
- , fIVec2_Type(new Type("ivec2", *fInt_Type, 2))
- , fIVec3_Type(new Type("ivec3", *fInt_Type, 3))
- , fIVec4_Type(new Type("ivec4", *fInt_Type, 4))
- , fBool_Type(new Type("bool", false))
- , fBVec2_Type(new Type("bvec2", *fBool_Type, 2))
- , fBVec3_Type(new Type("bvec3", *fBool_Type, 3))
- , fBVec4_Type(new Type("bvec4", *fBool_Type, 4))
- , fMat2x2_Type(new Type("mat2", *fFloat_Type, 2, 2))
- , fMat2x3_Type(new Type("mat2x3", *fFloat_Type, 2, 3))
- , fMat2x4_Type(new Type("mat2x4", *fFloat_Type, 2, 4))
- , fMat3x2_Type(new Type("mat3x2", *fFloat_Type, 3, 2))
- , fMat3x3_Type(new Type("mat3", *fFloat_Type, 3, 3))
- , fMat3x4_Type(new Type("mat3x4", *fFloat_Type, 3, 4))
- , fMat4x2_Type(new Type("mat4x2", *fFloat_Type, 4, 2))
- , fMat4x3_Type(new Type("mat4x3", *fFloat_Type, 4, 3))
- , fMat4x4_Type(new Type("mat4", *fFloat_Type, 4, 4))
- , fDMat2x2_Type(new Type("dmat2", *fFloat_Type, 2, 2))
- , fDMat2x3_Type(new Type("dmat2x3", *fFloat_Type, 2, 3))
- , fDMat2x4_Type(new Type("dmat2x4", *fFloat_Type, 2, 4))
- , fDMat3x2_Type(new Type("dmat3x2", *fFloat_Type, 3, 2))
- , fDMat3x3_Type(new Type("dmat3", *fFloat_Type, 3, 3))
- , fDMat3x4_Type(new Type("dmat3x4", *fFloat_Type, 3, 4))
- , fDMat4x2_Type(new Type("dmat4x2", *fFloat_Type, 4, 2))
- , fDMat4x3_Type(new Type("dmat4x3", *fFloat_Type, 4, 3))
- , fDMat4x4_Type(new Type("dmat4", *fFloat_Type, 4, 4))
- , fSampler1D_Type(new Type("sampler1D", SpvDim1D, false, false, false, true))
- , fSampler2D_Type(new Type("sampler2D", SpvDim2D, false, false, false, true))
- , fSampler3D_Type(new Type("sampler3D", SpvDim3D, false, false, false, true))
- , fSamplerExternalOES_Type(new Type("samplerExternalOES", SpvDim2D, false, false, false, true))
- , fSamplerCube_Type(new Type("samplerCube"))
- , fSampler2DRect_Type(new Type("sampler2DRect"))
- , fSampler1DArray_Type(new Type("sampler1DArray"))
- , fSampler2DArray_Type(new Type("sampler2DArray"))
- , fSamplerCubeArray_Type(new Type("samplerCubeArray"))
- , fSamplerBuffer_Type(new Type("samplerBuffer"))
- , fSampler2DMS_Type(new Type("sampler2DMS"))
- , fSampler2DMSArray_Type(new Type("sampler2DMSArray"))
- , fSampler1DShadow_Type(new Type("sampler1DShadow"))
- , fSampler2DShadow_Type(new Type("sampler2DShadow"))
- , fSamplerCubeShadow_Type(new Type("samplerCubeShadow"))
- , fSampler2DRectShadow_Type(new Type("sampler2DRectShadow"))
- , fSampler1DArrayShadow_Type(new Type("sampler1DArrayShadow"))
- , fSampler2DArrayShadow_Type(new Type("sampler2DArrayShadow"))
- , fSamplerCubeArrayShadow_Type(new Type("samplerCubeArrayShadow"))
+ : fInvalid_Type(new Type(SkString("<INVALID>")))
+ , fVoid_Type(new Type(SkString("void")))
+ , fDouble_Type(new Type(SkString("double"), true))
+ , fDVec2_Type(new Type(SkString("dvec2"), *fDouble_Type, 2))
+ , fDVec3_Type(new Type(SkString("dvec3"), *fDouble_Type, 3))
+ , fDVec4_Type(new Type(SkString("dvec4"), *fDouble_Type, 4))
+ , fFloat_Type(new Type(SkString("float"), true, { fDouble_Type.get() }))
+ , fVec2_Type(new Type(SkString("vec2"), *fFloat_Type, 2))
+ , fVec3_Type(new Type(SkString("vec3"), *fFloat_Type, 3))
+ , fVec4_Type(new Type(SkString("vec4"), *fFloat_Type, 4))
+ , fUInt_Type(new Type(SkString("uint"), true, { fFloat_Type.get(), fDouble_Type.get() }))
+ , fUVec2_Type(new Type(SkString("uvec2"), *fUInt_Type, 2))
+ , fUVec3_Type(new Type(SkString("uvec3"), *fUInt_Type, 3))
+ , fUVec4_Type(new Type(SkString("uvec4"), *fUInt_Type, 4))
+ , fInt_Type(new Type(SkString("int"), true, { fUInt_Type.get(), fFloat_Type.get(),
+ fDouble_Type.get() }))
+ , fIVec2_Type(new Type(SkString("ivec2"), *fInt_Type, 2))
+ , fIVec3_Type(new Type(SkString("ivec3"), *fInt_Type, 3))
+ , fIVec4_Type(new Type(SkString("ivec4"), *fInt_Type, 4))
+ , fBool_Type(new Type(SkString("bool"), false))
+ , fBVec2_Type(new Type(SkString("bvec2"), *fBool_Type, 2))
+ , fBVec3_Type(new Type(SkString("bvec3"), *fBool_Type, 3))
+ , fBVec4_Type(new Type(SkString("bvec4"), *fBool_Type, 4))
+ , fMat2x2_Type(new Type(SkString("mat2"), *fFloat_Type, 2, 2))
+ , fMat2x3_Type(new Type(SkString("mat2x3"), *fFloat_Type, 2, 3))
+ , fMat2x4_Type(new Type(SkString("mat2x4"), *fFloat_Type, 2, 4))
+ , fMat3x2_Type(new Type(SkString("mat3x2"), *fFloat_Type, 3, 2))
+ , fMat3x3_Type(new Type(SkString("mat3"), *fFloat_Type, 3, 3))
+ , fMat3x4_Type(new Type(SkString("mat3x4"), *fFloat_Type, 3, 4))
+ , fMat4x2_Type(new Type(SkString("mat4x2"), *fFloat_Type, 4, 2))
+ , fMat4x3_Type(new Type(SkString("mat4x3"), *fFloat_Type, 4, 3))
+ , fMat4x4_Type(new Type(SkString("mat4"), *fFloat_Type, 4, 4))
+ , fDMat2x2_Type(new Type(SkString("dmat2"), *fFloat_Type, 2, 2))
+ , fDMat2x3_Type(new Type(SkString("dmat2x3"), *fFloat_Type, 2, 3))
+ , fDMat2x4_Type(new Type(SkString("dmat2x4"), *fFloat_Type, 2, 4))
+ , fDMat3x2_Type(new Type(SkString("dmat3x2"), *fFloat_Type, 3, 2))
+ , fDMat3x3_Type(new Type(SkString("dmat3"), *fFloat_Type, 3, 3))
+ , fDMat3x4_Type(new Type(SkString("dmat3x4"), *fFloat_Type, 3, 4))
+ , fDMat4x2_Type(new Type(SkString("dmat4x2"), *fFloat_Type, 4, 2))
+ , fDMat4x3_Type(new Type(SkString("dmat4x3"), *fFloat_Type, 4, 3))
+ , fDMat4x4_Type(new Type(SkString("dmat4"), *fFloat_Type, 4, 4))
+ , fSampler1D_Type(new Type(SkString("sampler1D"), SpvDim1D, false, false, false, true))
+ , fSampler2D_Type(new Type(SkString("sampler2D"), SpvDim2D, false, false, false, true))
+ , fSampler3D_Type(new Type(SkString("sampler3D"), SpvDim3D, false, false, false, true))
+ , fSamplerExternalOES_Type(new Type(SkString("samplerExternalOES"), SpvDim2D, false, false,
+ false, true))
+ , fSamplerCube_Type(new Type(SkString("samplerCube")))
+ , fSampler2DRect_Type(new Type(SkString("sampler2DRect")))
+ , fSampler1DArray_Type(new Type(SkString("sampler1DArray")))
+ , fSampler2DArray_Type(new Type(SkString("sampler2DArray")))
+ , fSamplerCubeArray_Type(new Type(SkString("samplerCubeArray")))
+ , fSamplerBuffer_Type(new Type(SkString("samplerBuffer")))
+ , fSampler2DMS_Type(new Type(SkString("sampler2DMS")))
+ , fSampler2DMSArray_Type(new Type(SkString("sampler2DMSArray")))
+ , fSampler1DShadow_Type(new Type(SkString("sampler1DShadow")))
+ , fSampler2DShadow_Type(new Type(SkString("sampler2DShadow")))
+ , fSamplerCubeShadow_Type(new Type(SkString("samplerCubeShadow")))
+ , fSampler2DRectShadow_Type(new Type(SkString("sampler2DRectShadow")))
+ , fSampler1DArrayShadow_Type(new Type(SkString("sampler1DArrayShadow")))
+ , fSampler2DArrayShadow_Type(new Type(SkString("sampler2DArrayShadow")))
+ , fSamplerCubeArrayShadow_Type(new Type(SkString("samplerCubeArrayShadow")))
// Related to below FIXME, gsampler*s don't currently expand to cover integer case.
- , fISampler2D_Type(new Type("isampler2D", SpvDim2D, false, false, false, true))
+ , fISampler2D_Type(new Type(SkString("isampler2D"), SpvDim2D, false, false, false, true))
// FIXME express these as "gimage2D" that expand to image2D, iimage2D, and uimage2D.
- , fImage2D_Type(new Type("image2D", SpvDim2D, false, false, false, true))
- , fIImage2D_Type(new Type("iimage2D", SpvDim2D, false, false, false, true))
+ , fImage2D_Type(new Type(SkString("image2D"), SpvDim2D, false, false, false, true))
+ , fIImage2D_Type(new Type(SkString("iimage2D"), SpvDim2D, false, false, false, true))
// FIXME figure out what we're supposed to do with the gsampler et al. types)
- , fGSampler1D_Type(new Type("$gsampler1D", static_type(*fSampler1D_Type)))
- , fGSampler2D_Type(new Type("$gsampler2D", static_type(*fSampler2D_Type)))
- , fGSampler3D_Type(new Type("$gsampler3D", static_type(*fSampler3D_Type)))
- , fGSamplerCube_Type(new Type("$gsamplerCube", static_type(*fSamplerCube_Type)))
- , fGSampler2DRect_Type(new Type("$gsampler2DRect", static_type(*fSampler2DRect_Type)))
- , fGSampler1DArray_Type(new Type("$gsampler1DArray", static_type(*fSampler1DArray_Type)))
- , fGSampler2DArray_Type(new Type("$gsampler2DArray", static_type(*fSampler2DArray_Type)))
- , fGSamplerCubeArray_Type(new Type("$gsamplerCubeArray", static_type(*fSamplerCubeArray_Type)))
- , fGSamplerBuffer_Type(new Type("$gsamplerBuffer", static_type(*fSamplerBuffer_Type)))
- , fGSampler2DMS_Type(new Type("$gsampler2DMS", static_type(*fSampler2DMS_Type)))
- , fGSampler2DMSArray_Type(new Type("$gsampler2DMSArray", static_type(*fSampler2DMSArray_Type)))
- , fGSampler2DArrayShadow_Type(new Type("$gsampler2DArrayShadow",
+ , fGSampler1D_Type(new Type(SkString("$gsampler1D"), static_type(*fSampler1D_Type)))
+ , fGSampler2D_Type(new Type(SkString("$gsampler2D"), static_type(*fSampler2D_Type)))
+ , fGSampler3D_Type(new Type(SkString("$gsampler3D"), static_type(*fSampler3D_Type)))
+ , fGSamplerCube_Type(new Type(SkString("$gsamplerCube"), static_type(*fSamplerCube_Type)))
+ , fGSampler2DRect_Type(new Type(SkString("$gsampler2DRect"), static_type(*fSampler2DRect_Type)))
+ , fGSampler1DArray_Type(new Type(SkString("$gsampler1DArray"),
+ static_type(*fSampler1DArray_Type)))
+ , fGSampler2DArray_Type(new Type(SkString("$gsampler2DArray"),
+ static_type(*fSampler2DArray_Type)))
+ , fGSamplerCubeArray_Type(new Type(SkString("$gsamplerCubeArray"),
+ static_type(*fSamplerCubeArray_Type)))
+ , fGSamplerBuffer_Type(new Type(SkString("$gsamplerBuffer"), static_type(*fSamplerBuffer_Type)))
+ , fGSampler2DMS_Type(new Type(SkString("$gsampler2DMS"), static_type(*fSampler2DMS_Type)))
+ , fGSampler2DMSArray_Type(new Type(SkString("$gsampler2DMSArray"),
+ static_type(*fSampler2DMSArray_Type)))
+ , fGSampler2DArrayShadow_Type(new Type(SkString("$gsampler2DArrayShadow"),
static_type(*fSampler2DArrayShadow_Type)))
- , fGSamplerCubeArrayShadow_Type(new Type("$gsamplerCubeArrayShadow",
+ , fGSamplerCubeArrayShadow_Type(new Type(SkString("$gsamplerCubeArrayShadow"),
static_type(*fSamplerCubeArrayShadow_Type)))
- , fGenType_Type(new Type("$genType", { fFloat_Type.get(), fVec2_Type.get(), fVec3_Type.get(),
- fVec4_Type.get() }))
- , fGenDType_Type(new Type("$genDType", { fDouble_Type.get(), fDVec2_Type.get(),
- fDVec3_Type.get(), fDVec4_Type.get() }))
- , fGenIType_Type(new Type("$genIType", { fInt_Type.get(), fIVec2_Type.get(), fIVec3_Type.get(),
- fIVec4_Type.get() }))
- , fGenUType_Type(new Type("$genUType", { fUInt_Type.get(), fUVec2_Type.get(), fUVec3_Type.get(),
- fUVec4_Type.get() }))
- , fGenBType_Type(new Type("$genBType", { fBool_Type.get(), fBVec2_Type.get(), fBVec3_Type.get(),
- fBVec4_Type.get() }))
- , fMat_Type(new Type("$mat"))
- , fVec_Type(new Type("$vec", { fInvalid_Type.get(), fVec2_Type.get(), fVec3_Type.get(),
- fVec4_Type.get() }))
- , fGVec_Type(new Type("$gvec"))
- , fGVec2_Type(new Type("$gvec2"))
- , fGVec3_Type(new Type("$gvec3"))
- , fGVec4_Type(new Type("$gvec4", static_type(*fVec4_Type)))
- , fDVec_Type(new Type("$dvec", { fInvalid_Type.get(), fDVec2_Type.get(), fDVec3_Type.get(),
- fDVec4_Type.get() }))
- , fIVec_Type(new Type("$ivec", { fInvalid_Type.get(), fIVec2_Type.get(), fIVec3_Type.get(),
- fIVec4_Type.get() }))
- , fUVec_Type(new Type("$uvec", { fInvalid_Type.get(), fUVec2_Type.get(), fUVec3_Type.get(),
- fUVec4_Type.get() }))
- , fBVec_Type(new Type("$bvec", { fInvalid_Type.get(), fBVec2_Type.get(), fBVec3_Type.get(),
- fBVec4_Type.get() }))
+ , fGenType_Type(new Type(SkString("$genType"), { fFloat_Type.get(), fVec2_Type.get(),
+ fVec3_Type.get(), fVec4_Type.get() }))
+ , fGenDType_Type(new Type(SkString("$genDType"), { fDouble_Type.get(), fDVec2_Type.get(),
+ fDVec3_Type.get(), fDVec4_Type.get() }))
+ , fGenIType_Type(new Type(SkString("$genIType"), { fInt_Type.get(), fIVec2_Type.get(),
+ fIVec3_Type.get(), fIVec4_Type.get() }))
+ , fGenUType_Type(new Type(SkString("$genUType"), { fUInt_Type.get(), fUVec2_Type.get(),
+ fUVec3_Type.get(), fUVec4_Type.get() }))
+ , fGenBType_Type(new Type(SkString("$genBType"), { fBool_Type.get(), fBVec2_Type.get(),
+ fBVec3_Type.get(), fBVec4_Type.get() }))
+ , fMat_Type(new Type(SkString("$mat")))
+ , fVec_Type(new Type(SkString("$vec"), { fInvalid_Type.get(), fVec2_Type.get(),
+ fVec3_Type.get(), fVec4_Type.get() }))
+ , fGVec_Type(new Type(SkString("$gvec")))
+ , fGVec2_Type(new Type(SkString("$gvec2")))
+ , fGVec3_Type(new Type(SkString("$gvec3")))
+ , fGVec4_Type(new Type(SkString("$gvec4"), static_type(*fVec4_Type)))
+ , fDVec_Type(new Type(SkString("$dvec"), { fInvalid_Type.get(), fDVec2_Type.get(),
+ fDVec3_Type.get(), fDVec4_Type.get() }))
+ , fIVec_Type(new Type(SkString("$ivec"), { fInvalid_Type.get(), fIVec2_Type.get(),
+ fIVec3_Type.get(), fIVec4_Type.get() }))
+ , fUVec_Type(new Type(SkString("$uvec"), { fInvalid_Type.get(), fUVec2_Type.get(),
+ fUVec3_Type.get(), fUVec4_Type.get() }))
+ , fBVec_Type(new Type(SkString("$bvec"), { fInvalid_Type.get(), fBVec2_Type.get(),
+ fBVec3_Type.get(), fBVec4_Type.get() }))
, fDefined_Expression(new Defined(*fInvalid_Type)) {}
static std::vector<const Type*> static_type(const Type& t) {
@@ -252,8 +258,8 @@
Defined(const Type& type)
: INHERITED(Position(), kDefined_Kind, type) {}
- virtual std::string description() const override {
- return "<defined>";
+ virtual SkString description() const override {
+ return SkString("<defined>");
}
typedef Expression INHERITED;