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

Side by Side Diff: src/gpu/gl/debug/GrShaderObj.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/gl/debug/GrRenderBufferObj.h ('k') | src/gpu/gl/debug/GrTextureObj.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 /* 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 GrShaderObj_DEFINED 9 #ifndef GrShaderObj_DEFINED
10 #define GrShaderObj_DEFINED 10 #define GrShaderObj_DEFINED
11 11
12 #include "GrFakeRefObj.h" 12 #include "GrFakeRefObj.h"
13 #include "../GrGLDefines.h" 13 #include "../GrGLDefines.h"
14 14
15 //////////////////////////////////////////////////////////////////////////////// 15 ////////////////////////////////////////////////////////////////////////////////
16 class GrShaderObj : public GrFakeRefObj { 16 class GrShaderObj : public GrFakeRefObj {
17 GR_DEFINE_CREATOR(GrShaderObj); 17 GR_DEFINE_CREATOR(GrShaderObj);
18 18
19 public: 19 public:
20 GrShaderObj() 20 GrShaderObj()
21 : GrFakeRefObj() 21 : GrFakeRefObj()
22 , fType(GR_GL_VERTEX_SHADER) {} 22 , fType(GR_GL_VERTEX_SHADER) {}
23 23
24 void setType(GrGLenum type) { fType = type; } 24 void setType(GrGLenum type) { fType = type; }
25 GrGLenum getType() { return fType; } 25 GrGLenum getType() { return fType; }
26 26
27 void deleteAction() SK_OVERRIDE; 27 void deleteAction() override;
28 28
29 protected: 29 protected:
30 private: 30 private:
31 GrGLenum fType; // either GR_GL_VERTEX_SHADER or GR_GL_FRAGMENT_SHADER 31 GrGLenum fType; // either GR_GL_VERTEX_SHADER or GR_GL_FRAGMENT_SHADER
32 32
33 typedef GrFakeRefObj INHERITED; 33 typedef GrFakeRefObj INHERITED;
34 }; 34 };
35 35
36 #endif // GrShaderObj_DEFINED 36 #endif // GrShaderObj_DEFINED
OLDNEW
« no previous file with comments | « src/gpu/gl/debug/GrRenderBufferObj.h ('k') | src/gpu/gl/debug/GrTextureObj.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698