| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #ifndef GrTypesPriv_DEFINED | 8 #ifndef GrTypesPriv_DEFINED |
| 9 #define GrTypesPriv_DEFINED | 9 #define GrTypesPriv_DEFINED |
| 10 | 10 |
| 11 #include "GrTypes.h" | 11 #include "GrTypes.h" |
| 12 #include "SkTArray.h" | |
| 13 #include "SkRect.h" | 12 #include "SkRect.h" |
| 14 | 13 |
| 15 /** | 14 /** |
| 16 * Types of shader-language-specific boxed variables we can create. (Currently
only GrGLShaderVars, | 15 * Types of shader-language-specific boxed variables we can create. (Currently
only GrGLShaderVars, |
| 17 * but should be applicable to other shader languages.) | 16 * but should be applicable to other shader languages.) |
| 18 */ | 17 */ |
| 19 enum GrSLType { | 18 enum GrSLType { |
| 20 kVoid_GrSLType, | 19 kVoid_GrSLType, |
| 21 kFloat_GrSLType, | 20 kFloat_GrSLType, |
| 22 kVec2f_GrSLType, | 21 kVec2f_GrSLType, |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 // Takes a pointer to a GrCaps, and will suppress prints if required | 405 // Takes a pointer to a GrCaps, and will suppress prints if required |
| 407 #define GrCapsDebugf(caps, ...) \ | 406 #define GrCapsDebugf(caps, ...) \ |
| 408 if (!caps->suppressPrints()) { \ | 407 if (!caps->suppressPrints()) { \ |
| 409 SkDebugf(__VA_ARGS__); \ | 408 SkDebugf(__VA_ARGS__); \ |
| 410 } | 409 } |
| 411 #else | 410 #else |
| 412 #define GrCapsDebugf(caps, ...) | 411 #define GrCapsDebugf(caps, ...) |
| 413 #endif | 412 #endif |
| 414 | 413 |
| 415 #endif | 414 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1702073002:
Move SkTArray to include/private. (Closed)
Base URL: https://skia.googlesource.com/skia.git@master