diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-12 14:16:21 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-04-12 14:16:21 +0000 |
| commit | 13a950ae4e250f1a6a7074eb696591cafbfa71e6 (patch) | |
| tree | 18d05e223c7d9fdd118cacb1a22328212ae282d4 | |
| parent | 75f97e452e8f2ee55cd2b283df7d7734f48bc2bf (diff) | |
Use has_gl_extension_from_string in GrGLDefaultInterface_win.cpp (before the GL iface is installed).
git-svn-id: http://skia.googlecode.com/svn/trunk@1112 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gpu/src/win/GrGLDefaultInterface_win.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gpu/src/win/GrGLDefaultInterface_win.cpp b/gpu/src/win/GrGLDefaultInterface_win.cpp index 0a2c7867dd..62270151f6 100644 --- a/gpu/src/win/GrGLDefaultInterface_win.cpp +++ b/gpu/src/win/GrGLDefaultInterface_win.cpp @@ -127,7 +127,7 @@ void GrGLSetDefaultGLInterface() { // 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("GL_ARB_framebuffer_object")) { + if (major >= 3 || has_gl_extension_from_string("GL_ARB_framebuffer_object", extString)) { GR_GL_GET_PROC(GenFramebuffers); GR_GL_GET_PROC(BindFramebuffer); GR_GL_GET_PROC(FramebufferTexture2D); @@ -140,8 +140,7 @@ void GrGLSetDefaultGLInterface() { 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 (has_gl_extension_from_string("GL_EXT_framebuffer_object", extString)) { GR_GL_GET_PROC_SUFFIX(GenFramebuffers, EXT); GR_GL_GET_PROC_SUFFIX(BindFramebuffer, EXT); GR_GL_GET_PROC_SUFFIX(FramebufferTexture2D, EXT); @@ -152,12 +151,10 @@ void GrGLSetDefaultGLInterface() { 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 (has_gl_extension_from_string("GL_EXT_framebuffer_multisample", extString)) { GR_GL_GET_PROC_SUFFIX(RenderbufferStorageMultisample, EXT); } - if (has_gl_extension_from_string("GL_EXT_framebuffer_blit", - extString)) { + if (has_gl_extension_from_string("GL_EXT_framebuffer_blit", extString)) { GR_GL_GET_PROC_SUFFIX(BlitFramebuffer, EXT); } } else { |