OLD | NEW |
---|---|
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 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
468 } else { | 468 } else { |
469 if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_obje ct")) { | 469 if (glVer >= GR_GL_VER(3,0) || fExtensions.has("GL_OES_vertex_array_obje ct")) { |
470 if (NULL == fFunctions.fBindVertexArray || | 470 if (NULL == fFunctions.fBindVertexArray || |
471 NULL == fFunctions.fDeleteVertexArrays || | 471 NULL == fFunctions.fDeleteVertexArrays || |
472 NULL == fFunctions.fGenVertexArrays) { | 472 NULL == fFunctions.fGenVertexArrays) { |
473 return false; | 473 return false; |
474 } | 474 } |
475 } | 475 } |
476 } | 476 } |
477 | 477 |
478 #if 0 | 478 #if 1 |
bsalomon
2014/03/17 17:50:38
Can just remove the #if now that Chromium adds it
egdaniel
2014/03/17 19:49:12
yup it landed
On 2014/03/17 17:50:38, bsalomon wro
| |
479 if (fExtensions.has("GL_EXT_debug_marker")) { | 479 if (fExtensions.has("GL_EXT_debug_marker")) { |
480 if (NULL == fFunctions.fInsertEventMarker || | 480 if (NULL == fFunctions.fInsertEventMarker || |
481 NULL == fFunctions.fPushGroupMarker || | 481 NULL == fFunctions.fPushGroupMarker || |
482 NULL == fFunctions.fPopGroupMarker) { | 482 NULL == fFunctions.fPopGroupMarker) { |
483 return false; | 483 return false; |
484 } | 484 } |
485 } | 485 } |
486 #endif | 486 #endif |
487 return true; | 487 return true; |
488 } | 488 } |
OLD | NEW |