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

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

Issue 19569012: Turn on -Wall -Wextra on Mac, and fix all the warnings that crop up for /usr/bin/g++ and Clang 3.3. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: nit Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « src/core/SkPicture.cpp ('k') | src/gpu/GrDrawTargetCaps.h » ('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
(...skipping 23 matching lines...) Expand all
34 } 34 }
35 35
36 GrDrawState(const SkMatrix& initialViewMatrix) { 36 GrDrawState(const SkMatrix& initialViewMatrix) {
37 GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;) 37 GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;)
38 this->reset(initialViewMatrix); 38 this->reset(initialViewMatrix);
39 } 39 }
40 40
41 /** 41 /**
42 * Copies another draw state. 42 * Copies another draw state.
43 **/ 43 **/
44 GrDrawState(const GrDrawState& state) { 44 GrDrawState(const GrDrawState& state) : INHERITED() {
45 GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;) 45 GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;)
46 *this = state; 46 *this = state;
47 } 47 }
48 48
49 /** 49 /**
50 * Copies another draw state with a preconcat to the view matrix. 50 * Copies another draw state with a preconcat to the view matrix.
51 **/ 51 **/
52 GrDrawState(const GrDrawState& state, const SkMatrix& preConcatMatrix) { 52 GrDrawState(const GrDrawState& state, const SkMatrix& preConcatMatrix) {
53 GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;) 53 GR_DEBUGCODE(fBlockEffectRemovalCnt = 0;)
54 *this = state; 54 *this = state;
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 * @param count the number of attributes being set, limited to kMaxVer texAttribCnt. 1091 * @param count the number of attributes being set, limited to kMaxVer texAttribCnt.
1092 */ 1092 */
1093 void setVertexAttribs(const GrVertexAttrib attribs[], int count); 1093 void setVertexAttribs(const GrVertexAttrib attribs[], int count);
1094 1094
1095 typedef GrRefCnt INHERITED; 1095 typedef GrRefCnt INHERITED;
1096 }; 1096 };
1097 1097
1098 GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags); 1098 GR_MAKE_BITFIELD_OPS(GrDrawState::BlendOptFlags);
1099 1099
1100 #endif 1100 #endif
OLDNEW
« no previous file with comments | « src/core/SkPicture.cpp ('k') | src/gpu/GrDrawTargetCaps.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698