Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Side by Side Diff: src/gpu/GrDrawState.h

Issue 309683002: Move GrIPoint16 to SkIPoint16 (and remove GrPoint.h) (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update to ToT Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/GrAtlas.cpp ('k') | src/gpu/GrInOrderDrawBuffer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 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 GrDrawState_DEFINED 8 #ifndef GrDrawState_DEFINED
9 #define GrDrawState_DEFINED 9 #define GrDrawState_DEFINED
10 10
11 #include "GrBackendEffectFactory.h" 11 #include "GrBackendEffectFactory.h"
12 #include "GrBlend.h" 12 #include "GrBlend.h"
13 #include "GrColor.h" 13 #include "GrColor.h"
14 #include "GrEffectStage.h" 14 #include "GrEffectStage.h"
15 #include "GrPaint.h" 15 #include "GrPaint.h"
16 #include "GrPoint.h"
17 #include "GrRenderTarget.h" 16 #include "GrRenderTarget.h"
18 #include "GrStencil.h" 17 #include "GrStencil.h"
19 #include "GrTemplates.h" 18 #include "GrTemplates.h"
20 #include "GrTexture.h" 19 #include "GrTexture.h"
21 #include "GrTypesPriv.h" 20 #include "GrTypesPriv.h"
22 #include "effects/GrSimpleTextureEffect.h" 21 #include "effects/GrSimpleTextureEffect.h"
23 22
24 #include "SkMatrix.h" 23 #include "SkMatrix.h"
25 #include "SkTypes.h" 24 #include "SkTypes.h"
26 #include "SkXfermode.h" 25 #include "SkXfermode.h"
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 * @param count the number of attributes being set, limited to kMaxVer texAttribCnt. 1052 * @param count the number of attributes being set, limited to kMaxVer texAttribCnt.
1054 */ 1053 */
1055 void setVertexAttribs(const GrVertexAttrib attribs[], int count); 1054 void setVertexAttribs(const GrVertexAttrib attribs[], int count);
1056 1055
1057 typedef SkRefCnt INHERITED; 1056 typedef SkRefCnt INHERITED;
1058 }; 1057 };
1059 1058
1060 GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags); 1059 GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags);
1061 1060
1062 #endif 1061 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrAtlas.cpp ('k') | src/gpu/GrInOrderDrawBuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698