diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-08 20:36:22 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-08 20:36:22 +0000 |
| commit | 0efcc37952afb7629a5c905cc597f1cb837b987c (patch) | |
| tree | e16bc76b8a715fbc3b98edbebfefc692d86fa4f1 /src/gpu/gl/mac | |
| parent | 94e75ee46a569cbcdf61fb7f04ee3a69d3ca0896 (diff) | |
Remove glBlendEquation and glColorPointer
Review URL: http://codereview.appspot.com/6300075/
git-svn-id: http://skia.googlecode.com/svn/trunk@4216 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/mac')
| -rw-r--r-- | src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp index 2ae8782e5c..4735617c00 100644 --- a/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp +++ b/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp @@ -51,19 +51,10 @@ const GrGLInterface* GrGLCreateNativeInterface() { if (ver >= GR_GL_VER(1,4)) { interface->fBlendColor = glBlendColor; - interface->fBlendEquation = glBlendEquation; - } else if (GrGLHasExtensionFromString("GL_ARB_imaging", extStr)) { + } else if (GrGLHasExtensionFromString("GL_ARB_imaging", extStr) || + GrGLHasExtensionFromString("GL_EXT_blend_color", extStr)) { GET_PROC(BlendColor); - GET_PROC(BlendEquation); - } else { - if (GrGLHasExtensionFromString("GL_EXT_blend_color", extStr)) { - GET_PROC_SUFFIX(BlendColor, EXT); - } - if (GrGLHasExtensionFromString("GL_EXT_blend_minmax", extStr) || - GrGLHasExtensionFromString("GL_EXT_blend_subtract", extStr)) { - GET_PROC_SUFFIX(BlendEquation, EXT); - } - } + } interface->fBufferData = glBufferData; interface->fBufferSubData = glBufferSubData; @@ -71,7 +62,6 @@ const GrGLInterface* GrGLCreateNativeInterface() { interface->fClearColor = glClearColor; interface->fClearStencil = glClearStencil; interface->fColorMask = glColorMask; - interface->fColorPointer = glColorPointer; interface->fCompileShader = glCompileShader; interface->fCompressedTexImage2D = glCompressedTexImage2D; interface->fCreateProgram = glCreateProgram; |