| Index: include/gpu/GrTypesPriv.h
|
| diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h
|
| index dfe415345a46326e140de5865e9f9425c1ccf761..39c6fa2fd0b68377691e6991dc3b15012cd951c5 100644
|
| --- a/include/gpu/GrTypesPriv.h
|
| +++ b/include/gpu/GrTypesPriv.h
|
| @@ -24,8 +24,9 @@ enum GrSLType {
|
| kMat33f_GrSLType,
|
| kMat44f_GrSLType,
|
| kSampler2D_GrSLType,
|
| + kSampler3D_GrSLType,
|
|
|
| - kLast_GrSLType = kSampler2D_GrSLType
|
| + kLast_GrSLType = kSampler3D_GrSLType
|
| };
|
| static const int kGrSLTypeCount = kLast_GrSLType + 1;
|
|
|
| @@ -34,7 +35,7 @@ static const int kGrSLTypeCount = kLast_GrSLType + 1;
|
| */
|
| static inline int GrSLTypeVectorCount(GrSLType type) {
|
| SkASSERT(type >= 0 && type < static_cast<GrSLType>(kGrSLTypeCount));
|
| - static const int kCounts[] = { -1, 1, 2, 3, 4, -1, -1, -1 };
|
| + static const int kCounts[] = { -1, 1, 2, 3, 4, -1, -1, -1, -1 };
|
| return kCounts[type];
|
|
|
| GR_STATIC_ASSERT(0 == kVoid_GrSLType);
|
| @@ -45,6 +46,7 @@ static inline int GrSLTypeVectorCount(GrSLType type) {
|
| GR_STATIC_ASSERT(5 == kMat33f_GrSLType);
|
| GR_STATIC_ASSERT(6 == kMat44f_GrSLType);
|
| GR_STATIC_ASSERT(7 == kSampler2D_GrSLType);
|
| + GR_STATIC_ASSERT(8 == kSampler3D_GrSLType);
|
| GR_STATIC_ASSERT(SK_ARRAY_COUNT(kCounts) == kGrSLTypeCount);
|
| }
|
|
|
|
|