| Index: src/gpu/GrDefaultGeoProcFactory.h
|
| diff --git a/src/gpu/GrDefaultGeoProcFactory.h b/src/gpu/GrDefaultGeoProcFactory.h
|
| index cd886a20e246ae5059246a42e41ed48a6afed5de..2d8055843f321855fc544f2e6ef9fcd1d107ea7b 100644
|
| --- a/src/gpu/GrDefaultGeoProcFactory.h
|
| +++ b/src/gpu/GrDefaultGeoProcFactory.h
|
| @@ -64,14 +64,6 @@ namespace GrDefaultGeoProcFactory {
|
| GrColor fCoverage;
|
| };
|
|
|
| - enum GPType {
|
| - kPosition_GPType = 0x0, // we ALWAYS have position
|
| - kColor_GPType = 0x01,
|
| - kLocalCoord_GPType = 0x02,
|
| - kCoverage_GPType= 0x04,
|
| - kLastGPType = kCoverage_GPType
|
| - };
|
| -
|
| struct Color {
|
| enum Type {
|
| kNone_Type,
|
| @@ -113,6 +105,7 @@ namespace GrDefaultGeoProcFactory {
|
| kUnused_Type,
|
| kUsePosition_Type,
|
| kHasExplicit_Type,
|
| + kHasTransformed_Type,
|
| };
|
| LocalCoords(Type type) : fType(type), fMatrix(NULL) {}
|
| LocalCoords(Type type, const SkMatrix* matrix) : fType(type), fMatrix(matrix) {
|
|
|