| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2010 Google Inc. | 3 * Copyright 2010 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 #ifndef GrTypes_DEFINED | 9 #ifndef GrTypes_DEFINED |
| 10 #define GrTypes_DEFINED | 10 #define GrTypes_DEFINED |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 | 135 |
| 136 /** | 136 /** |
| 137 * Geometric primitives used for drawing. | 137 * Geometric primitives used for drawing. |
| 138 */ | 138 */ |
| 139 enum GrPrimitiveType { | 139 enum GrPrimitiveType { |
| 140 kTriangles_GrPrimitiveType, | 140 kTriangles_GrPrimitiveType, |
| 141 kTriangleStrip_GrPrimitiveType, | 141 kTriangleStrip_GrPrimitiveType, |
| 142 kTriangleFan_GrPrimitiveType, | 142 kTriangleFan_GrPrimitiveType, |
| 143 kPoints_GrPrimitiveType, | 143 kPoints_GrPrimitiveType, |
| 144 kLines_GrPrimitiveType, // 1 pix wide only | 144 kLines_GrPrimitiveType, // 1 pix wide only |
| 145 kLineStrip_GrPrimitiveType // 1 pix wide only | 145 kLineStrip_GrPrimitiveType, // 1 pix wide only |
| 146 kLast_GrPrimitiveType = kLineStrip_GrPrimitiveType |
| 146 }; | 147 }; |
| 147 | 148 |
| 148 static inline bool GrIsPrimTypeLines(GrPrimitiveType type) { | 149 static inline bool GrIsPrimTypeLines(GrPrimitiveType type) { |
| 149 return kLines_GrPrimitiveType == type || kLineStrip_GrPrimitiveType == type; | 150 return kLines_GrPrimitiveType == type || kLineStrip_GrPrimitiveType == type; |
| 150 } | 151 } |
| 151 | 152 |
| 152 static inline bool GrIsPrimTypeTris(GrPrimitiveType type) { | 153 static inline bool GrIsPrimTypeTris(GrPrimitiveType type) { |
| 153 return kTriangles_GrPrimitiveType == type || | 154 return kTriangles_GrPrimitiveType == type || |
| 154 kTriangleStrip_GrPrimitiveType == type || | 155 kTriangleStrip_GrPrimitiveType == type || |
| 155 kTriangleFan_GrPrimitiveType == type; | 156 kTriangleFan_GrPrimitiveType == type; |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 public: | 627 public: |
| 627 GrAutoMalloc() : INHERITED() {} | 628 GrAutoMalloc() : INHERITED() {} |
| 628 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} | 629 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} |
| 629 virtual ~GrAutoMalloc() {} | 630 virtual ~GrAutoMalloc() {} |
| 630 private: | 631 private: |
| 631 typedef GrAutoMallocBaseType INHERITED; | 632 typedef GrAutoMallocBaseType INHERITED; |
| 632 }; | 633 }; |
| 633 | 634 |
| 634 #undef GrAutoMallocBaseType | 635 #undef GrAutoMallocBaseType |
| 635 #endif | 636 #endif |
| OLD | NEW |