diff options
Diffstat (limited to 'src/sksl/ir/SkSLType.h')
-rw-r--r-- | src/sksl/ir/SkSLType.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/sksl/ir/SkSLType.h b/src/sksl/ir/SkSLType.h index c33b94b8b6..ed4b8d5abe 100644 --- a/src/sksl/ir/SkSLType.h +++ b/src/sksl/ir/SkSLType.h @@ -261,35 +261,35 @@ public: /** * For matrices and vectors, returns the type of individual cells (e.g. mat2 has a component - * type of kFloat_Type). For all other types, causes an assertion failure. + * type of kFloat_Type). For all other types, causes an SkASSERTion failure. */ const Type& componentType() const { - ASSERT(fComponentType); + SkASSERT(fComponentType); return *fComponentType; } /** * For matrices and vectors, returns the number of columns (e.g. both mat3 and float3return 3). * For scalars, returns 1. For arrays, returns either the size of the array (if known) or -1. - * For all other types, causes an assertion failure. + * For all other types, causes an SkASSERTion failure. */ int columns() const { - ASSERT(fTypeKind == kScalar_Kind || fTypeKind == kVector_Kind || + SkASSERT(fTypeKind == kScalar_Kind || fTypeKind == kVector_Kind || fTypeKind == kMatrix_Kind || fTypeKind == kArray_Kind); return fColumns; } /** * For matrices, returns the number of rows (e.g. mat2x4 returns 4). For vectors and scalars, - * returns 1. For all other types, causes an assertion failure. + * returns 1. For all other types, causes an SkASSERTion failure. */ int rows() const { - ASSERT(fRows > 0); + SkASSERT(fRows > 0); return fRows; } const std::vector<Field>& fields() const { - ASSERT(fTypeKind == kStruct_Kind); + SkASSERT(fTypeKind == kStruct_Kind); return fFields; } @@ -298,32 +298,32 @@ public: * types, returns a list of other types that this type can be coerced into. */ const std::vector<const Type*>& coercibleTypes() const { - ASSERT(fCoercibleTypes.size() > 0); + SkASSERT(fCoercibleTypes.size() > 0); return fCoercibleTypes; } SpvDim_ dimensions() const { - ASSERT(kSampler_Kind == fTypeKind); + SkASSERT(kSampler_Kind == fTypeKind); return fDimensions; } bool isDepth() const { - ASSERT(kSampler_Kind == fTypeKind); + SkASSERT(kSampler_Kind == fTypeKind); return fIsDepth; } bool isArrayed() const { - ASSERT(kSampler_Kind == fTypeKind); + SkASSERT(kSampler_Kind == fTypeKind); return fIsArrayed; } bool isMultisampled() const { - ASSERT(kSampler_Kind == fTypeKind); + SkASSERT(kSampler_Kind == fTypeKind); return fIsMultisampled; } bool isSampled() const { - ASSERT(kSampler_Kind == fTypeKind); + SkASSERT(kSampler_Kind == fTypeKind); return fIsSampled; } |