| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 enum { | 135 enum { |
| 136 kClear_HasColor_DrawOpFlag = 1 << 0 | 136 kClear_HasColor_DrawOpFlag = 1 << 0 |
| 137 }; | 137 }; |
| 138 enum { | 138 enum { |
| 139 kDrawTextOnPath_HasMatrix_DrawOpFlag = 1 << 0 | 139 kDrawTextOnPath_HasMatrix_DrawOpFlag = 1 << 0 |
| 140 }; | 140 }; |
| 141 enum { | 141 enum { |
| 142 kDrawVertices_HasTexs_DrawOpFlag = 1 << 0, | 142 kDrawVertices_HasTexs_DrawOpFlag = 1 << 0, |
| 143 kDrawVertices_HasColors_DrawOpFlag = 1 << 1, | 143 kDrawVertices_HasColors_DrawOpFlag = 1 << 1, |
| 144 kDrawVertices_HasIndices_DrawOpFlag = 1 << 2, | 144 kDrawVertices_HasIndices_DrawOpFlag = 1 << 2, |
| 145 kDrawVertices_HasXfermode_DrawOpFlag = 1 << 3, |
| 145 }; | 146 }; |
| 146 enum { | 147 enum { |
| 147 kDrawBitmap_HasPaint_DrawOpFlag = 1 << 0, | 148 kDrawBitmap_HasPaint_DrawOpFlag = 1 << 0, |
| 148 // Specific to drawBitmapRect, but needs to be different from HasPaint, | 149 // Specific to drawBitmapRect, but needs to be different from HasPaint, |
| 149 // which is used for all drawBitmap calls, so include it here. | 150 // which is used for all drawBitmap calls, so include it here. |
| 150 kDrawBitmap_HasSrcRect_DrawOpFlag = 1 << 1, | 151 kDrawBitmap_HasSrcRect_DrawOpFlag = 1 << 1, |
| 151 // SkCanvas::DrawBitmapRectFlags::kBleed_DrawBitmapRectFlag is | 152 // SkCanvas::DrawBitmapRectFlags::kBleed_DrawBitmapRectFlag is |
| 152 // converted into and out of this flag to save space | 153 // converted into and out of this flag to save space |
| 153 kDrawBitmap_Bleed_DrawOpFlag = 1 << 2, | 154 kDrawBitmap_Bleed_DrawOpFlag = 1 << 2, |
| 154 }; | 155 }; |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); | 277 SkASSERT(0 == (op & ~PAINTOPS_OP_MASK)); |
| 277 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); | 278 SkASSERT(0 == (flags & ~PAINTOPS_FLAG_MASK)); |
| 278 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); | 279 SkASSERT(0 == (data & ~PAINTOPS_DATA_MASK)); |
| 279 | 280 |
| 280 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | | 281 return (op << (PAINTOPS_FLAG_BITS + PAINTOPS_DATA_BITS)) | |
| 281 (flags << PAINTOPS_DATA_BITS) | | 282 (flags << PAINTOPS_DATA_BITS) | |
| 282 data; | 283 data; |
| 283 } | 284 } |
| 284 | 285 |
| 285 #endif | 286 #endif |
| OLD | NEW |