| 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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 kNoStencil_GrTextureFlagBit = 0x2, | 435 kNoStencil_GrTextureFlagBit = 0x2, |
| 436 /** | 436 /** |
| 437 * Hint that the CPU may modify this texture after creation. | 437 * Hint that the CPU may modify this texture after creation. |
| 438 */ | 438 */ |
| 439 kDynamicUpdate_GrTextureFlagBit = 0x4, | 439 kDynamicUpdate_GrTextureFlagBit = 0x4, |
| 440 /** | 440 /** |
| 441 * Indicates that all allocations (color buffer, FBO completeness, etc) | 441 * Indicates that all allocations (color buffer, FBO completeness, etc) |
| 442 * should be verified. | 442 * should be verified. |
| 443 */ | 443 */ |
| 444 kCheckAllocation_GrTextureFlagBit = 0x8, | 444 kCheckAllocation_GrTextureFlagBit = 0x8, |
| 445 /** |
| 446 * 3D texture |
| 447 */ |
| 448 k3DTexture_GrTextureFlagBit = 0x10, |
| 445 | 449 |
| 446 kDummy_GrTextureFlagBit, | 450 kDummy_GrTextureFlagBit, |
| 447 kLastPublic_GrTextureFlagBit = kDummy_GrTextureFlagBit-1, | 451 kLastPublic_GrTextureFlagBit = kDummy_GrTextureFlagBit-1, |
| 448 }; | 452 }; |
| 449 | 453 |
| 450 GR_MAKE_BITFIELD_OPS(GrTextureFlags) | 454 GR_MAKE_BITFIELD_OPS(GrTextureFlags) |
| 451 | 455 |
| 452 /** | 456 /** |
| 453 * Some textures will be stored such that the upper and left edges of the conten
t meet at the | 457 * Some textures will be stored such that the upper and left edges of the conten
t meet at the |
| 454 * the origin (in texture coord space) and for other textures the lower and left
edges meet at | 458 * the origin (in texture coord space) and for other textures the lower and left
edges meet at |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 public: | 722 public: |
| 719 GrAutoMalloc() : INHERITED() {} | 723 GrAutoMalloc() : INHERITED() {} |
| 720 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} | 724 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} |
| 721 virtual ~GrAutoMalloc() {} | 725 virtual ~GrAutoMalloc() {} |
| 722 private: | 726 private: |
| 723 typedef GrAutoMallocBaseType INHERITED; | 727 typedef GrAutoMallocBaseType INHERITED; |
| 724 }; | 728 }; |
| 725 | 729 |
| 726 #undef GrAutoMallocBaseType | 730 #undef GrAutoMallocBaseType |
| 727 #endif | 731 #endif |
| OLD | NEW |