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

Side by Side Diff: src/gpu/effects/GrSimpleTextureEffect.h

Issue 371103003: Remove GrEffect::CreateEffectRef and GrEffect::AutoEffectRef. (Closed) Base URL: https://skia.googlesource.com/skia.git@no_ref2
Patch Set: Address comments and update for new YUV effect Created 6 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
« no previous file with comments | « src/gpu/effects/GrRRectEffect.cpp ('k') | src/gpu/effects/GrTextureDomain.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 GrSimpleTextureEffect_DEFINED 8 #ifndef GrSimpleTextureEffect_DEFINED
9 #define GrSimpleTextureEffect_DEFINED 9 #define GrSimpleTextureEffect_DEFINED
10 10
11 #include "GrSingleTextureEffect.h" 11 #include "GrSingleTextureEffect.h"
12 12
13 class GrGLSimpleTextureEffect; 13 class GrGLSimpleTextureEffect;
14 14
15 /** 15 /**
16 * The output color of this effect is a modulation of the input color and a samp le from a texture. 16 * The output color of this effect is a modulation of the input color and a samp le from a texture.
17 * It allows explicit specification of the filtering and wrap modes (GrTexturePa rams). It can use 17 * It allows explicit specification of the filtering and wrap modes (GrTexturePa rams). It can use
18 * local coords, positions, or a custom vertex attribute as input texture coords . The input coords 18 * local coords, positions, or a custom vertex attribute as input texture coords . The input coords
19 * can have a matrix applied in the VS in both the local and position cases but not with a custom 19 * can have a matrix applied in the VS in both the local and position cases but not with a custom
20 * attribute coords at this time. It will add a varying to input interpolate tex ture coords to the 20 * attribute coords at this time. It will add a varying to input interpolate tex ture coords to the
21 * FS. 21 * FS.
22 */ 22 */
23 class GrSimpleTextureEffect : public GrSingleTextureEffect { 23 class GrSimpleTextureEffect : public GrSingleTextureEffect {
24 public: 24 public:
25 /* unfiltered, clamp mode */ 25 /* unfiltered, clamp mode */
26 static GrEffectRef* Create(GrTexture* tex, 26 static GrEffectRef* Create(GrTexture* tex,
27 const SkMatrix& matrix, 27 const SkMatrix& matrix,
28 GrCoordSet coordSet = kLocal_GrCoordSet) { 28 GrCoordSet coordSet = kLocal_GrCoordSet) {
29 AutoEffectUnref effect(SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, G rTextureParams::kNone_FilterMode, coordSet))); 29 return SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, GrTextureParams:: kNone_FilterMode,
30 return CreateEffectRef(effect); 30 coordSet));
31 } 31 }
32 32
33 /* clamp mode */ 33 /* clamp mode */
34 static GrEffectRef* Create(GrTexture* tex, 34 static GrEffectRef* Create(GrTexture* tex,
35 const SkMatrix& matrix, 35 const SkMatrix& matrix,
36 GrTextureParams::FilterMode filterMode, 36 GrTextureParams::FilterMode filterMode,
37 GrCoordSet coordSet = kLocal_GrCoordSet) { 37 GrCoordSet coordSet = kLocal_GrCoordSet) {
38 AutoEffectUnref effect( 38 return SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, filterMode, coord Set));
39 SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, filterMode, coordSet )));
40 return CreateEffectRef(effect);
41 } 39 }
42 40
43 static GrEffectRef* Create(GrTexture* tex, 41 static GrEffectRef* Create(GrTexture* tex,
44 const SkMatrix& matrix, 42 const SkMatrix& matrix,
45 const GrTextureParams& p, 43 const GrTextureParams& p,
46 GrCoordSet coordSet = kLocal_GrCoordSet) { 44 GrCoordSet coordSet = kLocal_GrCoordSet) {
47 AutoEffectUnref effect(SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, p , coordSet))); 45 return SkNEW_ARGS(GrSimpleTextureEffect, (tex, matrix, p, coordSet));
48 return CreateEffectRef(effect);
49 } 46 }
50 47
51 virtual ~GrSimpleTextureEffect() {} 48 virtual ~GrSimpleTextureEffect() {}
52 49
53 static const char* Name() { return "Texture"; } 50 static const char* Name() { return "Texture"; }
54 51
55 virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags ) const SK_OVERRIDE; 52 virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags ) const SK_OVERRIDE;
56 53
57 typedef GrGLSimpleTextureEffect GLEffect; 54 typedef GrGLSimpleTextureEffect GLEffect;
58 55
(...skipping 18 matching lines...) Expand all
77 const GrSimpleTextureEffect& ste = CastEffect<GrSimpleTextureEffect>(oth er); 74 const GrSimpleTextureEffect& ste = CastEffect<GrSimpleTextureEffect>(oth er);
78 return this->hasSameTextureParamsMatrixAndSourceCoords(ste); 75 return this->hasSameTextureParamsMatrixAndSourceCoords(ste);
79 } 76 }
80 77
81 GR_DECLARE_EFFECT_TEST; 78 GR_DECLARE_EFFECT_TEST;
82 79
83 typedef GrSingleTextureEffect INHERITED; 80 typedef GrSingleTextureEffect INHERITED;
84 }; 81 };
85 82
86 #endif 83 #endif
OLDNEW
« no previous file with comments | « src/gpu/effects/GrRRectEffect.cpp ('k') | src/gpu/effects/GrTextureDomain.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698