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

Side by Side Diff: src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp

Issue 184443003: Add Gpu Tracing to Ganesh (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Merge fixes 2 Created 6 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/android/GrGLCreateNativeInterface_android.cpp ('k') | no next file » | 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 GET_PROC(GetFramebufferAttachmentParameteriv); 149 GET_PROC(GetFramebufferAttachmentParameteriv);
150 GET_PROC(GetRenderbufferParameteriv); 150 GET_PROC(GetRenderbufferParameteriv);
151 GET_PROC(RenderbufferStorage); 151 GET_PROC(RenderbufferStorage);
152 152
153 functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOE S"); 153 functions->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOE S");
154 functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBu fferOES"); 154 functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBu fferOES");
155 155
156 #if GL_EXT_debug_marker 156 #if GL_EXT_debug_marker
157 functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddres s("glInsertEventMarkerEXT"); 157 functions->fInsertEventMarker = (GrGLInsertEventMarkerProc) eglGetProcAddres s("glInsertEventMarkerEXT");
158 functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress( "glPushGroupMarkerEXT"); 158 functions->fPushGroupMarker = (GrGLInsertEventMarkerProc) eglGetProcAddress( "glPushGroupMarkerEXT");
159 functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glP opGropuMarkerEXT"); 159 functions->fPopGroupMarker = (GrGLPopGroupMarkerProc) eglGetProcAddress("glP opGroupMarkerEXT");
160 #endif 160 #endif
161 161
162 interface->fExtensions.init(kGLES_GrGLStandard, 162 interface->fExtensions.init(kGLES_GrGLStandard,
163 interface->fFunctions.fGetString, 163 interface->fFunctions.fGetString,
164 interface->fFunctions.fGetStringi, 164 interface->fFunctions.fGetStringi,
165 interface->fFunctions.fGetIntegerv); 165 interface->fFunctions.fGetIntegerv);
166 return interface; 166 return interface;
167 } 167 }
OLDNEW
« no previous file with comments | « src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698