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

Side by Side Diff: src/gpu/gl/GrGLCaps.h

Issue 344253003: "interface" is defined in Windows headers, so undef it in GrGLCaps so we don't have a name collision (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 | « no previous file | no next file » | 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 2012 Google Inc. 2 * Copyright 2012 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 8
9 #ifndef GrGLCaps_DEFINED 9 #ifndef GrGLCaps_DEFINED
10 #define GrGLCaps_DEFINED 10 #define GrGLCaps_DEFINED
11 11
12 #include "GrDrawTargetCaps.h" 12 #include "GrDrawTargetCaps.h"
13 #include "GrGLStencilBuffer.h" 13 #include "GrGLStencilBuffer.h"
14 #include "SkTArray.h" 14 #include "SkTArray.h"
15 #include "SkTDArray.h" 15 #include "SkTDArray.h"
16 16
17 // defined in Windows headers
18 #undef interface
19
17 class GrGLContextInfo; 20 class GrGLContextInfo;
18 21
19 /** 22 /**
20 * Stores some capabilities of a GL context. Most are determined by the GL 23 * Stores some capabilities of a GL context. Most are determined by the GL
21 * version and the extensions string. It also tracks formats that have passed 24 * version and the extensions string. It also tracks formats that have passed
22 * the FBO completeness test. 25 * the FBO completeness test.
23 */ 26 */
24 class GrGLCaps : public GrDrawTargetCaps { 27 class GrGLCaps : public GrDrawTargetCaps {
25 public: 28 public:
26 SK_DECLARE_INST_COUNT(GrGLCaps) 29 SK_DECLARE_INST_COUNT(GrGLCaps)
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 110
108 /** 111 /**
109 * Resets the caps such that nothing is supported. 112 * Resets the caps such that nothing is supported.
110 */ 113 */
111 virtual void reset() SK_OVERRIDE; 114 virtual void reset() SK_OVERRIDE;
112 115
113 /** 116 /**
114 * Initializes the GrGLCaps to the set of features supported in the current 117 * Initializes the GrGLCaps to the set of features supported in the current
115 * OpenGL context accessible via ctxInfo. 118 * OpenGL context accessible via ctxInfo.
116 */ 119 */
117 bool init(const GrGLContextInfo& ctxInfo, const GrGLInterface* interface); 120 bool init(const GrGLContextInfo& ctxInfo, const GrGLInterface* interface);
mtklein 2014/06/20 18:48:17 Maybe you can just drop the parameter names?
118 121
119 /** 122 /**
120 * Call to note that a color config has been verified as a valid color 123 * Call to note that a color config has been verified as a valid color
121 * attachment. This may save future calls to glCheckFramebufferStatus 124 * attachment. This may save future calls to glCheckFramebufferStatus
122 * using isConfigVerifiedColorAttachment(). 125 * using isConfigVerifiedColorAttachment().
123 */ 126 */
124 void markConfigAsValidColorAttachment(GrPixelConfig config) { 127 void markConfigAsValidColorAttachment(GrPixelConfig config) {
125 fVerifiedColorConfigs.markVerified(config); 128 fVerifiedColorConfigs.markVerified(config);
126 } 129 }
127 130
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 bool fVertexArrayObjectSupport : 1; 364 bool fVertexArrayObjectSupport : 1;
362 bool fUseNonVBOVertexAndIndexDynamicData : 1; 365 bool fUseNonVBOVertexAndIndexDynamicData : 1;
363 bool fIsCoreProfile : 1; 366 bool fIsCoreProfile : 1;
364 bool fFullClearIsFree : 1; 367 bool fFullClearIsFree : 1;
365 bool fDropsTileOnZeroDivide : 1; 368 bool fDropsTileOnZeroDivide : 1;
366 369
367 typedef GrDrawTargetCaps INHERITED; 370 typedef GrDrawTargetCaps INHERITED;
368 }; 371 };
369 372
370 #endif 373 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698