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

Side by Side Diff: src/gpu/gl/debug/GrGLCreateDebugInterface.cpp

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/GrFrameBufferObj.h ('k') | src/gpu/gl/debug/GrProgramObj.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 9
10 #include "gl/GrGLInterface.h" 10 #include "gl/GrGLInterface.h"
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 } 789 }
790 790
791 virtual ~GrDebugGLInterface() { 791 virtual ~GrDebugGLInterface() {
792 GrDebugGL::staticUnRef(); 792 GrDebugGL::staticUnRef();
793 } 793 }
794 794
795 void setWrapped(GrGLInterface *interface) { 795 void setWrapped(GrGLInterface *interface) {
796 fWrapped.reset(interface); 796 fWrapped.reset(interface);
797 } 797 }
798 798
799 void abandon() const SK_OVERRIDE { 799 void abandon() const override {
800 GrDebugGL::abandon(); 800 GrDebugGL::abandon();
801 } 801 }
802 802
803 // TODO: there are some issues w/ wrapping another GL interface inside the 803 // TODO: there are some issues w/ wrapping another GL interface inside the
804 // debug interface: 804 // debug interface:
805 // Since none of the "gl" methods are member functions they don't get 805 // Since none of the "gl" methods are member functions they don't get
806 // a "this" pointer through which to access "fWrapped" 806 // a "this" pointer through which to access "fWrapped"
807 // This could be worked around by having all of them access the 807 // This could be worked around by having all of them access the
808 // "glInterface" pointer - i.e., treating the debug interface as a 808 // "glInterface" pointer - i.e., treating the debug interface as a
809 // true singleton 809 // true singleton
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 functions->fMatrixLoadIdentity = noOpGLMatrixLoadIdentity; 976 functions->fMatrixLoadIdentity = noOpGLMatrixLoadIdentity;
977 977
978 functions->fBindFragDataLocationIndexed = 978 functions->fBindFragDataLocationIndexed =
979 noOpGLBindFragDataLocationIndexed; 979 noOpGLBindFragDataLocationIndexed;
980 980
981 interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functio ns->fGetStringi, 981 interface->fExtensions.init(kGL_GrGLStandard, functions->fGetString, functio ns->fGetStringi,
982 functions->fGetIntegerv); 982 functions->fGetIntegerv);
983 983
984 return interface; 984 return interface;
985 } 985 }
OLDNEW
« no previous file with comments | « src/gpu/gl/debug/GrFrameBufferObj.h ('k') | src/gpu/gl/debug/GrProgramObj.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698