| Index: include/gpu/GrShaderVar.h
|
| diff --git a/include/gpu/GrShaderVar.h b/include/gpu/GrShaderVar.h
|
| index 68ce34b8ef8d0520dee17d577711597eb5d740c4..3f56eaf70acb9e2245592361e84a2a14b149c91f 100644
|
| --- a/include/gpu/GrShaderVar.h
|
| +++ b/include/gpu/GrShaderVar.h
|
| @@ -51,7 +51,7 @@ public:
|
| , fName(name)
|
| , fCount(arrayCount)
|
| , fPrecision(precision) {
|
| - SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| + SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsNumeric(type));
|
| SkASSERT(kVoid_GrSLType != type);
|
| }
|
|
|
| @@ -62,7 +62,7 @@ public:
|
| , fName(name)
|
| , fCount(arrayCount)
|
| , fPrecision(precision) {
|
| - SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| + SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsNumeric(type));
|
| SkASSERT(kVoid_GrSLType != type);
|
| }
|
|
|
| @@ -73,7 +73,7 @@ public:
|
| , fName(name)
|
| , fCount(arrayCount)
|
| , fPrecision(precision) {
|
| - SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| + SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsNumeric(type));
|
| SkASSERT(kVoid_GrSLType != type);
|
| }
|
|
|
| @@ -91,7 +91,7 @@ public:
|
| GrSLPrecision precision = kDefault_GrSLPrecision,
|
| int count = kNonArray) {
|
| SkASSERT(kVoid_GrSLType != type);
|
| - SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| + SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsNumeric(type));
|
| fType = type;
|
| fTypeModifier = typeModifier;
|
| fName = name;
|
| @@ -105,7 +105,7 @@ public:
|
| GrSLPrecision precision = kDefault_GrSLPrecision,
|
| int count = kNonArray) {
|
| SkASSERT(kVoid_GrSLType != type);
|
| - SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsFloatType(type));
|
| + SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeIsNumeric(type));
|
| fType = type;
|
| fTypeModifier = typeModifier;
|
| fName = name;
|
|
|