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

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

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 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
« no previous file with comments | « src/gpu/effects/GrBicubicEffect.cpp ('k') | src/gpu/effects/GrBitmapTextGeoProc.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 GrBitmapTextGeoProc_DEFINED 8 #ifndef GrBitmapTextGeoProc_DEFINED
9 #define GrBitmapTextGeoProc_DEFINED 9 #define GrBitmapTextGeoProc_DEFINED
10 10
(...skipping 12 matching lines...) Expand all
23 public: 23 public:
24 static GrGeometryProcessor* Create(GrColor color, GrTexture* tex, const GrTe xtureParams& p, 24 static GrGeometryProcessor* Create(GrColor color, GrTexture* tex, const GrTe xtureParams& p,
25 GrMaskFormat format, bool opaqueVertexCol ors, 25 GrMaskFormat format, bool opaqueVertexCol ors,
26 const SkMatrix& localMatrix) { 26 const SkMatrix& localMatrix) {
27 return SkNEW_ARGS(GrBitmapTextGeoProc, (color, tex, p, format, opaqueVer texColors, 27 return SkNEW_ARGS(GrBitmapTextGeoProc, (color, tex, p, format, opaqueVer texColors,
28 localMatrix)); 28 localMatrix));
29 } 29 }
30 30
31 virtual ~GrBitmapTextGeoProc() {} 31 virtual ~GrBitmapTextGeoProc() {}
32 32
33 const char* name() const SK_OVERRIDE { return "Texture"; } 33 const char* name() const override { return "Texture"; }
34 34
35 const Attribute* inPosition() const { return fInPosition; } 35 const Attribute* inPosition() const { return fInPosition; }
36 const Attribute* inColor() const { return fInColor; } 36 const Attribute* inColor() const { return fInColor; }
37 const Attribute* inTextureCoords() const { return fInTextureCoords; } 37 const Attribute* inTextureCoords() const { return fInTextureCoords; }
38 GrMaskFormat maskFormat() const { return fMaskFormat; } 38 GrMaskFormat maskFormat() const { return fMaskFormat; }
39 39
40 virtual void getGLProcessorKey(const GrBatchTracker& bt, 40 virtual void getGLProcessorKey(const GrBatchTracker& bt,
41 const GrGLCaps& caps, 41 const GrGLCaps& caps,
42 GrProcessorKeyBuilder* b) const SK_OVERRIDE; 42 GrProcessorKeyBuilder* b) const override;
43 43
44 virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt, 44 virtual GrGLPrimitiveProcessor* createGLInstance(const GrBatchTracker& bt,
45 const GrGLCaps& caps) const SK_OVERRIDE; 45 const GrGLCaps& caps) const override;
46 46
47 void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const SK_OVERR IDE; 47 void initBatchTracker(GrBatchTracker*, const GrPipelineInfo&) const override ;
48 bool onCanMakeEqual(const GrBatchTracker&, 48 bool onCanMakeEqual(const GrBatchTracker&,
49 const GrGeometryProcessor&, 49 const GrGeometryProcessor&,
50 const GrBatchTracker&) const SK_OVERRIDE; 50 const GrBatchTracker&) const override;
51 51
52 private: 52 private:
53 GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& para ms, 53 GrBitmapTextGeoProc(GrColor, GrTexture* texture, const GrTextureParams& para ms,
54 GrMaskFormat format, bool opaqueVertexColors, const SkMa trix& localMatrix); 54 GrMaskFormat format, bool opaqueVertexColors, const SkMa trix& localMatrix);
55 55
56 bool onIsEqual(const GrGeometryProcessor& other) const SK_OVERRIDE; 56 bool onIsEqual(const GrGeometryProcessor& other) const override;
57 57
58 void onGetInvariantOutputColor(GrInitInvariantOutput*) const SK_OVERRIDE; 58 void onGetInvariantOutputColor(GrInitInvariantOutput*) const override;
59 59
60 void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const SK_OVERRIDE; 60 void onGetInvariantOutputCoverage(GrInitInvariantOutput*) const override;
61 61
62 GrTextureAccess fTextureAccess; 62 GrTextureAccess fTextureAccess;
63 const Attribute* fInPosition; 63 const Attribute* fInPosition;
64 const Attribute* fInColor; 64 const Attribute* fInColor;
65 const Attribute* fInTextureCoords; 65 const Attribute* fInTextureCoords;
66 GrMaskFormat fMaskFormat; 66 GrMaskFormat fMaskFormat;
67 67
68 GR_DECLARE_GEOMETRY_PROCESSOR_TEST; 68 GR_DECLARE_GEOMETRY_PROCESSOR_TEST;
69 69
70 typedef GrGeometryProcessor INHERITED; 70 typedef GrGeometryProcessor INHERITED;
71 }; 71 };
72 72
73 #endif 73 #endif
OLDNEW
« no previous file with comments | « src/gpu/effects/GrBicubicEffect.cpp ('k') | src/gpu/effects/GrBitmapTextGeoProc.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698