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

Side by Side Diff: src/gpu/gl/GrGLProgram.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/GrGLPathRendering.h ('k') | src/gpu/gl/GrGLRenderTarget.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 2011 Google Inc. 2 * Copyright 2011 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 8
9 #ifndef GrGLProgram_DEFINED 9 #ifndef GrGLProgram_DEFINED
10 #define GrGLProgram_DEFINED 10 #define GrGLProgram_DEFINED
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 GrGLNvprProgram(GrGLGpu*, 168 GrGLNvprProgram(GrGLGpu*,
169 const GrProgramDesc&, 169 const GrProgramDesc&,
170 const BuiltinUniformHandles&, 170 const BuiltinUniformHandles&,
171 GrGLuint programID, 171 GrGLuint programID,
172 const UniformInfoArray&, 172 const UniformInfoArray&,
173 GrGLInstalledGeoProc*, 173 GrGLInstalledGeoProc*,
174 GrGLInstalledXferProc* xferProcessor, 174 GrGLInstalledXferProc* xferProcessor,
175 GrGLInstalledFragProcs* fragmentProcessors); 175 GrGLInstalledFragProcs* fragmentProcessors);
176 176
177 private: 177 private:
178 void didSetData() SK_OVERRIDE; 178 void didSetData() override;
179 virtual void setTransformData(const GrPrimitiveProcessor&, 179 virtual void setTransformData(const GrPrimitiveProcessor&,
180 const GrPendingFragmentStage&, 180 const GrPendingFragmentStage&,
181 int index, 181 int index,
182 GrGLInstalledFragProc*) SK_OVERRIDE; 182 GrGLInstalledFragProc*) override;
183 virtual void onSetRenderTargetState(const GrPrimitiveProcessor&, const GrPip eline&); 183 virtual void onSetRenderTargetState(const GrPrimitiveProcessor&, const GrPip eline&);
184 184
185 friend class GrGLNvprProgramBuilder; 185 friend class GrGLNvprProgramBuilder;
186 186
187 typedef GrGLProgram INHERITED; 187 typedef GrGLProgram INHERITED;
188 }; 188 };
189 189
190 #endif 190 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLPathRendering.h ('k') | src/gpu/gl/GrGLRenderTarget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698