| 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 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 kNoStencil_GrTextureFlagBit = 0x2, | 437 kNoStencil_GrTextureFlagBit = 0x2, |
| 438 /** | 438 /** |
| 439 * Hint that the CPU may modify this texture after creation. | 439 * Hint that the CPU may modify this texture after creation. |
| 440 */ | 440 */ |
| 441 kDynamicUpdate_GrTextureFlagBit = 0x4, | 441 kDynamicUpdate_GrTextureFlagBit = 0x4, |
| 442 /** | 442 /** |
| 443 * Indicates that all allocations (color buffer, FBO completeness, etc) | 443 * Indicates that all allocations (color buffer, FBO completeness, etc) |
| 444 * should be verified. | 444 * should be verified. |
| 445 */ | 445 */ |
| 446 kCheckAllocation_GrTextureFlagBit = 0x8, | 446 kCheckAllocation_GrTextureFlagBit = 0x8, |
| 447 |
| 448 kDummy_GrTextureFlagBit, |
| 449 kLastPublic_GrTextureFlagBit = kDummy_GrTextureFlagBit-1, |
| 447 }; | 450 }; |
| 448 | 451 |
| 449 GR_MAKE_BITFIELD_OPS(GrTextureFlags) | 452 GR_MAKE_BITFIELD_OPS(GrTextureFlags) |
| 450 | 453 |
| 451 /** | 454 /** |
| 452 * 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 |
| 453 * 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 |
| 454 * 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 |
| 455 * to BottomLeft. | 458 * to BottomLeft. |
| 456 */ | 459 */ |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 717 public: | 720 public: |
| 718 GrAutoMalloc() : INHERITED() {} | 721 GrAutoMalloc() : INHERITED() {} |
| 719 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} | 722 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} |
| 720 virtual ~GrAutoMalloc() {} | 723 virtual ~GrAutoMalloc() {} |
| 721 private: | 724 private: |
| 722 typedef GrAutoMallocBaseType INHERITED; | 725 typedef GrAutoMallocBaseType INHERITED; |
| 723 }; | 726 }; |
| 724 | 727 |
| 725 #undef GrAutoMallocBaseType | 728 #undef GrAutoMallocBaseType |
| 726 #endif | 729 #endif |
| OLD | NEW |