Cleanup handling of GL versions, fix function names
Review URL: http://codereview.appspot.com/5097044/
git-svn-id: http://skia.googlecode.com/svn/trunk@2308 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/win/GrGLDefaultInterface_win.cpp b/gpu/src/win/GrGLDefaultInterface_win.cpp
index b257b94..faa72a9 100644
--- a/gpu/src/win/GrGLDefaultInterface_win.cpp
+++ b/gpu/src/win/GrGLDefaultInterface_win.cpp
@@ -27,12 +27,11 @@
// context. For that reason we create a new GrGLInterface each time we're
// called.
if (NULL != wglGetCurrentContext()) {
- int major, minor;
const char* versionString = (const char*) glGetString(GL_VERSION);
const char* extString = (const char*) glGetString(GL_EXTENSIONS);
- gl_version_from_string(&major, &minor, versionString);
+ GrGLVersion glVer = GrGLGetVersionFromString(versionString);
- if (major == 1 && minor < 5) {
+ if (glVer < GR_GL_VER(1,5)) {
// We must have array and element_array buffer objects.
return NULL;
}
@@ -145,7 +144,8 @@
// First look for GL3.0 FBO or GL_ARB_framebuffer_object (same since
// GL_ARB_framebuffer_object doesn't use ARB suffix.)
- if (major >= 3 || has_gl_extension_from_string("GL_ARB_framebuffer_object", extString)) {
+ if (glVer > GR_GL_VER(3,0) ||
+ GrGLHasExtensionFromString("GL_ARB_framebuffer_object", extString)) {
GR_GL_GET_PROC(GenFramebuffers);
GR_GL_GET_PROC(GetFramebufferAttachmentParameteriv);
GR_GL_GET_PROC(GetRenderbufferParameteriv);
@@ -160,7 +160,8 @@
GR_GL_GET_PROC(BindRenderbuffer);
GR_GL_GET_PROC(RenderbufferStorageMultisample);
GR_GL_GET_PROC(BlitFramebuffer);
- } else if (has_gl_extension_from_string("GL_EXT_framebuffer_object", extString)) {
+ } else if (GrGLHasExtensionFromString("GL_EXT_framebuffer_object",
+ extString)) {
GR_GL_GET_PROC_SUFFIX(GenFramebuffers, EXT);
GR_GL_GET_PROC_SUFFIX(GetFramebufferAttachmentParameteriv, EXT);
GR_GL_GET_PROC_SUFFIX(GetRenderbufferParameteriv, EXT);
@@ -173,10 +174,10 @@
GR_GL_GET_PROC_SUFFIX(DeleteRenderbuffers, EXT);
GR_GL_GET_PROC_SUFFIX(FramebufferRenderbuffer, EXT);
GR_GL_GET_PROC_SUFFIX(BindRenderbuffer, EXT);
- if (has_gl_extension_from_string("GL_EXT_framebuffer_multisample", extString)) {
+ if (GrGLHasExtensionFromString("GL_EXT_framebuffer_multisample", extString)) {
GR_GL_GET_PROC_SUFFIX(RenderbufferStorageMultisample, EXT);
}
- if (has_gl_extension_from_string("GL_EXT_framebuffer_blit", extString)) {
+ if (GrGLHasExtensionFromString("GL_EXT_framebuffer_blit", extString)) {
GR_GL_GET_PROC_SUFFIX(BlitFramebuffer, EXT);
}
} else {