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

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

Issue 23137022: Replace uses of GR_DEBUG by SK_DEBUG. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: not GR_RELEASE Created 7 years, 3 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/GrGLProgram.cpp ('k') | src/gpu/gl/GrGpuGL.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 2013 Google Inc. 2 * Copyright 2013 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 GrGLProgramDesc_DEFINED 8 #ifndef GrGLProgramDesc_DEFINED
9 #define GrGLProgramDesc_DEFINED 9 #define GrGLProgramDesc_DEFINED
10 10
11 #include "GrGLEffect.h" 11 #include "GrGLEffect.h"
12 #include "GrDrawState.h" 12 #include "GrDrawState.h"
13 #include "GrGLShaderBuilder.h" 13 #include "GrGLShaderBuilder.h"
14 14
15 class GrGpuGL; 15 class GrGpuGL;
16 16
17 // optionally compile the experimental GS code. Set to GR_DEBUG so that debug bu ild bots will 17 #ifdef SK_DEBUG
18 // execute the code. 18 // Optionally compile the experimental GS code. Set to SK_DEBUG so that debug build bots will
19 #define GR_GL_EXPERIMENTAL_GS GR_DEBUG 19 // execute the code.
20 #define GR_GL_EXPERIMENTAL_GS 1
21 #else
22 #define GR_GL_EXPERIMENTAL_GS 0
23 #endif
20 24
21 25
22 /** This class describes a program to generate. It also serves as a program cach e key. Very little 26 /** This class describes a program to generate. It also serves as a program cach e key. Very little
23 of this is GL-specific. There is the generation of GrGLEffect::EffectKeys an d the dst-read part 27 of this is GL-specific. There is the generation of GrGLEffect::EffectKeys an d the dst-read part
24 of the key set by GrGLShaderBuilder. If the interfaces that set those portio ns were abstracted 28 of the key set by GrGLShaderBuilder. If the interfaces that set those portio ns were abstracted
25 to be API-neutral then so could this class. */ 29 to be API-neutral then so could this class. */
26 class GrGLProgramDesc { 30 class GrGLProgramDesc {
27 public: 31 public:
28 GrGLProgramDesc() : fInitialized(false) {} 32 GrGLProgramDesc() : fInitialized(false) {}
29 GrGLProgramDesc(const GrGLProgramDesc& desc) { *this = desc; } 33 GrGLProgramDesc(const GrGLProgramDesc& desc) { *this = desc; }
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 SkAutoSMalloc<kPreAllocSize> fKey; 216 SkAutoSMalloc<kPreAllocSize> fKey;
213 bool fInitialized; 217 bool fInitialized;
214 218
215 // GrGLProgram and GrGLShaderBuilder read the private fields to generate cod e. TODO: Move all 219 // GrGLProgram and GrGLShaderBuilder read the private fields to generate cod e. TODO: Move all
216 // code generation to GrGLShaderBuilder (and maybe add getters rather than f riending). 220 // code generation to GrGLShaderBuilder (and maybe add getters rather than f riending).
217 friend class GrGLProgram; 221 friend class GrGLProgram;
218 friend class GrGLShaderBuilder; 222 friend class GrGLShaderBuilder;
219 }; 223 };
220 224
221 #endif 225 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgram.cpp ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698