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

Side by Side Diff: src/gpu/gl/debug/GrDebugGL.h

Issue 12915007: Fix a few clang errors while trying to build tools target. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rm SkAutoMemoryUsageProbe Created 7 years, 9 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/gpu/gl/GrGLEffectMatrix.cpp ('k') | src/image/SkSurface_Picture.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 /* 2 /*
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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 #ifndef GrDebugGL_DEFINED 9 #ifndef GrDebugGL_DEFINED
10 #define GrDebugGL_DEFINED 10 #define GrDebugGL_DEFINED
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 } 115 }
116 116
117 protected: 117 protected:
118 118
119 private: 119 private:
120 // the OpenGLES 2.0 spec says this must be >= 2 120 // the OpenGLES 2.0 spec says this must be >= 2
121 static const GrGLint kDefaultMaxTextureUnits = 8; 121 static const GrGLint kDefaultMaxTextureUnits = 8;
122 122
123 GrGLint fPackRowLength; 123 GrGLint fPackRowLength;
124 GrGLint fUnPackRowLength; 124 GrGLint fUnPackRowLength;
125 GrGLuint fMaxTextureUnits;
126 GrGLuint fCurTextureUnit; 125 GrGLuint fCurTextureUnit;
127 GrBufferObj* fArrayBuffer; 126 GrBufferObj* fArrayBuffer;
128 GrBufferObj* fElementArrayBuffer; 127 GrBufferObj* fElementArrayBuffer;
129 GrFrameBufferObj* fFrameBuffer; 128 GrFrameBufferObj* fFrameBuffer;
130 GrRenderBufferObj* fRenderBuffer; 129 GrRenderBufferObj* fRenderBuffer;
131 GrProgramObj* fProgram; 130 GrProgramObj* fProgram;
132 GrTextureObj* fTexture; 131 GrTextureObj* fTexture;
133 GrTextureUnitObj *fTextureUnits[kDefaultMaxTextureUnits]; 132 GrTextureUnitObj *fTextureUnits[kDefaultMaxTextureUnits];
134 GrVertexArrayObj *fVertexArray; 133 GrVertexArrayObj *fVertexArray;
135 134
(...skipping 16 matching lines...) Expand all
152 // type) easier 151 // type) easier
153 #define GR_CREATE(className, classEnum) \ 152 #define GR_CREATE(className, classEnum) \
154 reinterpret_cast<className *>(GrDebugGL::getInstance()->createObj(classEnum) ) 153 reinterpret_cast<className *>(GrDebugGL::getInstance()->createObj(classEnum) )
155 154
156 //////////////////////////////////////////////////////////////////////////////// 155 ////////////////////////////////////////////////////////////////////////////////
157 // Helper macro to make finding objects less painful 156 // Helper macro to make finding objects less painful
158 #define GR_FIND(id, className, classEnum) \ 157 #define GR_FIND(id, className, classEnum) \
159 reinterpret_cast<className *>(GrDebugGL::getInstance()->findObject(id, class Enum)) 158 reinterpret_cast<className *>(GrDebugGL::getInstance()->findObject(id, class Enum))
160 159
161 #endif // GrDebugGL_DEFINED 160 #endif // GrDebugGL_DEFINED
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLEffectMatrix.cpp ('k') | src/image/SkSurface_Picture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698