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

Side by Side Diff: src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp

Issue 133413003: Rename GrGLBinding->GrGLStandard, no longer a bitfield (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: actually fix enum names? Created 6 years, 11 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 | Annotate | Revision Log
OLDNEW
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 GrGLGetIntegervProc glGetIntegerv = 54 GrGLGetIntegervProc glGetIntegerv =
55 (GrGLGetIntegervProc) GetProcAddress(alu.get(), "glGetIntegerv"); 55 (GrGLGetIntegervProc) GetProcAddress(alu.get(), "glGetIntegerv");
56 if (NULL == glGetString || NULL == glGetIntegerv) { 56 if (NULL == glGetString || NULL == glGetIntegerv) {
57 return NULL; 57 return NULL;
58 } 58 }
59 59
60 // This may or may not succeed depending on the gl version. 60 // This may or may not succeed depending on the gl version.
61 GrGLGetStringiProc glGetStringi = (GrGLGetStringiProc) wglGetProcAddres s("glGetStringi"); 61 GrGLGetStringiProc glGetStringi = (GrGLGetStringiProc) wglGetProcAddres s("glGetStringi");
62 62
63 GrGLExtensions extensions; 63 GrGLExtensions extensions;
64 if (!extensions.init(kDesktop_GrGLBinding, glGetString, glGetStringi, gl GetIntegerv)) { 64 if (!extensions.init(kGL_GrGLStandard, glGetString, glGetStringi, glGetI ntegerv)) {
65 return NULL; 65 return NULL;
66 } 66 }
67 const char* versionString = (const char*) glGetString(GR_GL_VERSION); 67 const char* versionString = (const char*) glGetString(GR_GL_VERSION);
68 GrGLVersion glVer = GrGLGetVersionFromString(versionString); 68 GrGLVersion glVer = GrGLGetVersionFromString(versionString);
69 69
70 if (glVer < GR_GL_VER(1,5)) { 70 if (glVer < GR_GL_VER(1,5)) {
71 // We must have array and element_array buffer objects. 71 // We must have array and element_array buffer objects.
72 return NULL; 72 return NULL;
73 } 73 }
74 GrGLInterface* interface = SkNEW(GrGLInterface); 74 GrGLInterface* interface = SkNEW(GrGLInterface);
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 WGL_SET_PROC_SUFFIX(GetPathColorGeniv, NV); 300 WGL_SET_PROC_SUFFIX(GetPathColorGeniv, NV);
301 WGL_SET_PROC_SUFFIX(GetPathColorGenfv, NV); 301 WGL_SET_PROC_SUFFIX(GetPathColorGenfv, NV);
302 WGL_SET_PROC_SUFFIX(GetPathTexGeniv, NV); 302 WGL_SET_PROC_SUFFIX(GetPathTexGeniv, NV);
303 WGL_SET_PROC_SUFFIX(GetPathTexGenfv, NV); 303 WGL_SET_PROC_SUFFIX(GetPathTexGenfv, NV);
304 WGL_SET_PROC_SUFFIX(IsPointInFillPath, NV); 304 WGL_SET_PROC_SUFFIX(IsPointInFillPath, NV);
305 WGL_SET_PROC_SUFFIX(IsPointInStrokePath, NV); 305 WGL_SET_PROC_SUFFIX(IsPointInStrokePath, NV);
306 WGL_SET_PROC_SUFFIX(GetPathLength, NV); 306 WGL_SET_PROC_SUFFIX(GetPathLength, NV);
307 WGL_SET_PROC_SUFFIX(PointAlongPath, NV); 307 WGL_SET_PROC_SUFFIX(PointAlongPath, NV);
308 } 308 }
309 309
310 interface->fBindingsExported = kDesktop_GrGLBinding; 310 interface->fStandard = kGL_GrGLStandard;
311 311
312 return interface; 312 return interface;
313 } else { 313 } else {
314 return NULL; 314 return NULL;
315 } 315 }
316 } 316 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698