| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 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/GrGLExtensions.h" | 10 #include "gl/GrGLExtensions.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 if (NULL != glXGetCurrentContext()) { | 25 if (NULL != glXGetCurrentContext()) { |
| 26 | 26 |
| 27 const char* versionString = (const char*) glGetString(GL_VERSION); | 27 const char* versionString = (const char*) glGetString(GL_VERSION); |
| 28 GrGLVersion glVer = GrGLGetVersionFromString(versionString); | 28 GrGLVersion glVer = GrGLGetVersionFromString(versionString); |
| 29 | 29 |
| 30 // This may or may not succeed depending on the gl version. | 30 // This may or may not succeed depending on the gl version. |
| 31 GrGLGetStringiProc glGetStringi = | 31 GrGLGetStringiProc glGetStringi = |
| 32 (GrGLGetStringiProc) glXGetProcAddress(reinterpret_cast<const GLubyt
e*>("glGetStringi")); | 32 (GrGLGetStringiProc) glXGetProcAddress(reinterpret_cast<const GLubyt
e*>("glGetStringi")); |
| 33 | 33 |
| 34 GrGLExtensions extensions; | 34 GrGLExtensions extensions; |
| 35 if (!extensions.init(kDesktop_GrGLBinding, glGetString, glGetStringi, gl
GetIntegerv)) { | 35 if (!extensions.init(kGL_GrGLStandard, glGetString, glGetStringi, glGetI
ntegerv)) { |
| 36 return NULL; | 36 return NULL; |
| 37 } | 37 } |
| 38 | 38 |
| 39 if (glVer < GR_GL_VER(1,5)) { | 39 if (glVer < GR_GL_VER(1,5)) { |
| 40 // We must have array and element_array buffer objects. | 40 // We must have array and element_array buffer objects. |
| 41 return NULL; | 41 return NULL; |
| 42 } | 42 } |
| 43 | 43 |
| 44 GrGLInterface* interface = SkNEW(GrGLInterface()); | 44 GrGLInterface* interface = SkNEW(GrGLInterface()); |
| 45 | 45 |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 GR_GL_GET_PROC_SUFFIX(GetPathColorGeniv, NV); | 268 GR_GL_GET_PROC_SUFFIX(GetPathColorGeniv, NV); |
| 269 GR_GL_GET_PROC_SUFFIX(GetPathColorGenfv, NV); | 269 GR_GL_GET_PROC_SUFFIX(GetPathColorGenfv, NV); |
| 270 GR_GL_GET_PROC_SUFFIX(GetPathTexGeniv, NV); | 270 GR_GL_GET_PROC_SUFFIX(GetPathTexGeniv, NV); |
| 271 GR_GL_GET_PROC_SUFFIX(GetPathTexGenfv, NV); | 271 GR_GL_GET_PROC_SUFFIX(GetPathTexGenfv, NV); |
| 272 GR_GL_GET_PROC_SUFFIX(IsPointInFillPath, NV); | 272 GR_GL_GET_PROC_SUFFIX(IsPointInFillPath, NV); |
| 273 GR_GL_GET_PROC_SUFFIX(IsPointInStrokePath, NV); | 273 GR_GL_GET_PROC_SUFFIX(IsPointInStrokePath, NV); |
| 274 GR_GL_GET_PROC_SUFFIX(GetPathLength, NV); | 274 GR_GL_GET_PROC_SUFFIX(GetPathLength, NV); |
| 275 GR_GL_GET_PROC_SUFFIX(PointAlongPath, NV); | 275 GR_GL_GET_PROC_SUFFIX(PointAlongPath, NV); |
| 276 } | 276 } |
| 277 | 277 |
| 278 interface->fBindingsExported = kDesktop_GrGLBinding; | 278 interface->fStandard = kGL_GrGLStandard; |
| 279 | 279 |
| 280 return interface; | 280 return interface; |
| 281 } else { | 281 } else { |
| 282 return NULL; | 282 return NULL; |
| 283 } | 283 } |
| 284 } | 284 } |
| OLD | NEW |