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

Side by Side Diff: src/gpu/gl/GrGLInterface.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/GrTracing.h ('k') | src/gpu/gl/GrGpuGL.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 #include "gl/GrGLInterface.h" 9 #include "gl/GrGLInterface.h"
10 #include "gl/GrGLExtensions.h" 10 #include "gl/GrGLExtensions.h"
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 } else { 472 } else {
473 if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_obje ct")) { 473 if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_obje ct")) {
474 if (NULL == fFunctions.fBindVertexArray || 474 if (NULL == fFunctions.fBindVertexArray ||
475 NULL == fFunctions.fDeleteVertexArrays || 475 NULL == fFunctions.fDeleteVertexArrays ||
476 NULL == fFunctions.fGenVertexArrays) { 476 NULL == fFunctions.fGenVertexArrays) {
477 RETURN_FALSE_INTERFACE 477 RETURN_FALSE_INTERFACE
478 } 478 }
479 } 479 }
480 } 480 }
481 481
482 #if 0
483 if (fExtensions.has("GL_EXT_debug_marker")) { 482 if (fExtensions.has("GL_EXT_debug_marker")) {
484 if (NULL == fFunctions.fInsertEventMarker || 483 if (NULL == fFunctions.fInsertEventMarker ||
485 NULL == fFunctions.fPushGroupMarker || 484 NULL == fFunctions.fPushGroupMarker ||
486 NULL == fFunctions.fPopGroupMarker) { 485 NULL == fFunctions.fPopGroupMarker) {
487 RETURN_FALSE_INTERFACE 486 RETURN_FALSE_INTERFACE
488 } 487 }
489 } 488 }
490 #endif
491 return true; 489 return true;
492 } 490 }
OLDNEW
« no previous file with comments | « src/gpu/GrTracing.h ('k') | src/gpu/gl/GrGpuGL.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698