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

Side by Side Diff: include/gpu/GrTBackendEffectFactory.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 | « include/gpu/GrResource.h ('k') | include/gpu/GrTexture.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 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 #ifndef GrTBackendEffectFactory_DEFINED 8 #ifndef GrTBackendEffectFactory_DEFINED
9 #define GrTBackendEffectFactory_DEFINED 9 #define GrTBackendEffectFactory_DEFINED
10 10
(...skipping 18 matching lines...) Expand all
29 a GrEffect. This enables caching of generated shaders. Part of the 29 a GrEffect. This enables caching of generated shaders. Part of the
30 id identifies the GrEffect subclass. The remainder is based 30 id identifies the GrEffect subclass. The remainder is based
31 on the aspects of the GrEffect object's configuration that affect 31 on the aspects of the GrEffect object's configuration that affect
32 GLSL code generation. */ 32 GLSL code generation. */
33 virtual EffectKey glEffectKey(const GrDrawEffect& drawEffect, 33 virtual EffectKey glEffectKey(const GrDrawEffect& drawEffect,
34 const GrGLCaps& caps) const SK_OVERRIDE { 34 const GrGLCaps& caps) const SK_OVERRIDE {
35 SkASSERT(kIllegalEffectClassID != fEffectClassID); 35 SkASSERT(kIllegalEffectClassID != fEffectClassID);
36 EffectKey effectKey = GLEffect::GenKey(drawEffect, caps); 36 EffectKey effectKey = GLEffect::GenKey(drawEffect, caps);
37 EffectKey textureKey = GLEffect::GenTextureKey(drawEffect, caps); 37 EffectKey textureKey = GLEffect::GenTextureKey(drawEffect, caps);
38 EffectKey attribKey = GLEffect::GenAttribKey(drawEffect); 38 EffectKey attribKey = GLEffect::GenAttribKey(drawEffect);
39 #if GR_DEBUG 39 #ifdef SK_DEBUG
40 static const EffectKey kIllegalIDMask = (uint16_t) (~((1U << kEffectKeyB its) - 1)); 40 static const EffectKey kIllegalIDMask = (uint16_t) (~((1U << kEffectKeyB its) - 1));
41 SkASSERT(!(kIllegalIDMask & effectKey)); 41 SkASSERT(!(kIllegalIDMask & effectKey));
42 42
43 static const EffectKey kIllegalTextureKeyMask = (uint16_t) (~((1U << kTe xtureKeyBits) - 1)); 43 static const EffectKey kIllegalTextureKeyMask = (uint16_t) (~((1U << kTe xtureKeyBits) - 1));
44 SkASSERT(!(kIllegalTextureKeyMask & textureKey)); 44 SkASSERT(!(kIllegalTextureKeyMask & textureKey));
45 45
46 static const EffectKey kIllegalAttribKeyMask = (uint16_t) (~((1U << kAtt ribKeyBits) - 1)); 46 static const EffectKey kIllegalAttribKeyMask = (uint16_t) (~((1U << kAtt ribKeyBits) - 1));
47 SkASSERT(!(kIllegalAttribKeyMask & textureKey)); 47 SkASSERT(!(kIllegalAttribKeyMask & textureKey));
48 #endif 48 #endif
49 return fEffectClassID | (attribKey << (kEffectKeyBits+kTextureKeyBits)) | 49 return fEffectClassID | (attribKey << (kEffectKeyBits+kTextureKeyBits)) |
(...skipping 19 matching lines...) Expand all
69 return *gInstance; 69 return *gInstance;
70 } 70 }
71 71
72 protected: 72 protected:
73 GrTBackendEffectFactory() { 73 GrTBackendEffectFactory() {
74 fEffectClassID = GenID() << (kAttribKeyBits + kEffectKeyBits + kTextureK eyBits) ; 74 fEffectClassID = GenID() << (kAttribKeyBits + kEffectKeyBits + kTextureK eyBits) ;
75 } 75 }
76 }; 76 };
77 77
78 #endif 78 #endif
OLDNEW
« no previous file with comments | « include/gpu/GrResource.h ('k') | include/gpu/GrTexture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698