| 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 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 * Optional bitfield flags that can be set on GrSurfaceDesc (below). | 383 * Optional bitfield flags that can be set on GrSurfaceDesc (below). |
| 384 */ | 384 */ |
| 385 enum GrSurfaceFlags { | 385 enum GrSurfaceFlags { |
| 386 kNone_GrSurfaceFlags = 0x0, | 386 kNone_GrSurfaceFlags = 0x0, |
| 387 /** | 387 /** |
| 388 * Creates a texture that can be rendered to as a GrRenderTarget. Use | 388 * Creates a texture that can be rendered to as a GrRenderTarget. Use |
| 389 * GrTexture::asRenderTarget() to access. | 389 * GrTexture::asRenderTarget() to access. |
| 390 */ | 390 */ |
| 391 kRenderTarget_GrSurfaceFlag = 0x1, | 391 kRenderTarget_GrSurfaceFlag = 0x1, |
| 392 /** | 392 /** |
| 393 * DEPRECATED. This has no effect. | |
| 394 */ | |
| 395 kNoStencil_GrSurfaceFlag = 0x2, | |
| 396 /** | |
| 397 * Indicates that all allocations (color buffer, FBO completeness, etc) | 393 * Indicates that all allocations (color buffer, FBO completeness, etc) |
| 398 * should be verified. | 394 * should be verified. |
| 399 */ | 395 */ |
| 400 kCheckAllocation_GrSurfaceFlag = 0x4, | 396 kCheckAllocation_GrSurfaceFlag = 0x4, |
| 401 }; | 397 }; |
| 402 | 398 |
| 403 GR_MAKE_BITFIELD_OPS(GrSurfaceFlags) | 399 GR_MAKE_BITFIELD_OPS(GrSurfaceFlags) |
| 404 | 400 |
| 405 // Legacy aliases | |
| 406 typedef GrSurfaceFlags GrTextureFlags; | |
| 407 static const GrSurfaceFlags kNone_GrTextureFlags = kNone_GrSurfaceFlags; | |
| 408 static const GrSurfaceFlags kRenderTarget_GrTextureFlagBit = kRenderTarget_GrSur
faceFlag; | |
| 409 static const GrSurfaceFlags kNoStencil_GrTextureFlagBit = kNoStencil_GrSurfaceFl
ag; | |
| 410 static const GrSurfaceFlags kCheckAllocation_GrTextureFlagBit = kCheckAllocation
_GrSurfaceFlag; | |
| 411 | |
| 412 /** | 401 /** |
| 413 * Some textures will be stored such that the upper and left edges of the conten
t meet at the | 402 * Some textures will be stored such that the upper and left edges of the conten
t meet at the |
| 414 * the origin (in texture coord space) and for other textures the lower and left
edges meet at | 403 * the origin (in texture coord space) and for other textures the lower and left
edges meet at |
| 415 * the origin. kDefault_GrSurfaceOrigin sets textures to TopLeft, and render tar
gets | 404 * the origin. kDefault_GrSurfaceOrigin sets textures to TopLeft, and render tar
gets |
| 416 * to BottomLeft. | 405 * to BottomLeft. |
| 417 */ | 406 */ |
| 418 | 407 |
| 419 enum GrSurfaceOrigin { | 408 enum GrSurfaceOrigin { |
| 420 kDefault_GrSurfaceOrigin, // DEPRECATED; to be removed | 409 kDefault_GrSurfaceOrigin, // DEPRECATED; to be removed |
| 421 kTopLeft_GrSurfaceOrigin, | 410 kTopLeft_GrSurfaceOrigin, |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 public: | 615 public: |
| 627 GrAutoMalloc() : INHERITED() {} | 616 GrAutoMalloc() : INHERITED() {} |
| 628 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} | 617 explicit GrAutoMalloc(size_t size) : INHERITED(size) {} |
| 629 virtual ~GrAutoMalloc() {} | 618 virtual ~GrAutoMalloc() {} |
| 630 private: | 619 private: |
| 631 typedef GrAutoMallocBaseType INHERITED; | 620 typedef GrAutoMallocBaseType INHERITED; |
| 632 }; | 621 }; |
| 633 | 622 |
| 634 #undef GrAutoMallocBaseType | 623 #undef GrAutoMallocBaseType |
| 635 #endif | 624 #endif |
| OLD | NEW |