| 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 | 9 |
| 10 | 10 |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 * should be verified. | 440 * should be verified. |
| 441 */ | 441 */ |
| 442 kCheckAllocation_GrSurfaceFlag = 0x4, | 442 kCheckAllocation_GrSurfaceFlag = 0x4, |
| 443 }; | 443 }; |
| 444 | 444 |
| 445 GR_MAKE_BITFIELD_OPS(GrSurfaceFlags) | 445 GR_MAKE_BITFIELD_OPS(GrSurfaceFlags) |
| 446 | 446 |
| 447 // Legacy aliases | 447 // Legacy aliases |
| 448 typedef GrSurfaceFlags GrTextureFlags; | 448 typedef GrSurfaceFlags GrTextureFlags; |
| 449 static const GrSurfaceFlags kNone_GrTextureFlags = kNone_GrSurfaceFlags; | 449 static const GrSurfaceFlags kNone_GrTextureFlags = kNone_GrSurfaceFlags; |
| 450 static const GrSurfaceFlags kRenderTarget_GrTExtureFlagBit = kRenderTarget_GrSur
faceFlag; | 450 static const GrSurfaceFlags kRenderTarget_GrTextureFlagBit = kRenderTarget_GrSur
faceFlag; |
| 451 static const GrSurfaceFlags kNoStencil_GrTextureFlagBit = kNoStencil_GrSurfaceFl
ag; | 451 static const GrSurfaceFlags kNoStencil_GrTextureFlagBit = kNoStencil_GrSurfaceFl
ag; |
| 452 static const GrSurfaceFlags kCheckAllocation_GrTextureFlagBit = kCheckAllocation
_GrSurfaceFlag; | 452 static const GrSurfaceFlags kCheckAllocation_GrTextureFlagBit = kCheckAllocation
_GrSurfaceFlag; |
| 453 | 453 |
| 454 /** | 454 /** |
| 455 * Some textures will be stored such that the upper and left edges of the conten
t meet at the | 455 * Some textures will be stored such that the upper and left edges of the conten
t meet at the |
| 456 * the origin (in texture coord space) and for other textures the lower and left
edges meet at | 456 * the origin (in texture coord space) and for other textures the lower and left
edges meet at |
| 457 * the origin. kDefault_GrSurfaceOrigin sets textures to TopLeft, and render tar
gets | 457 * the origin. kDefault_GrSurfaceOrigin sets textures to TopLeft, and render tar
gets |
| 458 * to BottomLeft. | 458 * to BottomLeft. |
| 459 */ | 459 */ |
| 460 | 460 |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 public: | 720 public: |
| 721 GrAutoMalloc() : INHERITED() {} | 721 GrAutoMalloc() : INHERITED() {} |
| 722 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} | 722 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} |
| 723 virtual ~GrAutoMalloc() {} | 723 virtual ~GrAutoMalloc() {} |
| 724 private: | 724 private: |
| 725 typedef GrAutoMallocBaseType INHERITED; | 725 typedef GrAutoMallocBaseType INHERITED; |
| 726 }; | 726 }; |
| 727 | 727 |
| 728 #undef GrAutoMallocBaseType | 728 #undef GrAutoMallocBaseType |
| 729 #endif | 729 #endif |
| OLD | NEW |