Replace GrGLInterface's function pointers with std::functions

include/gpu/gl/GrGLFunctions.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLFunctions_DEFINED
 #define GrGLFunctions_DEFINED
 
+#include <functional>
 #include "GrGLTypes.h"
+#include "../private/SkTLogic.h"

[bungeman-skia, 2016/02/08 20:22:52]

I imagine this include was added in order to replace
std::remove_pointer<GLPTR>::type with skstd::remove_pointer_t<GLPTR>. However
that didn't seem to happen, so either this include should be removed or the code
below changed. As things stand, it would be better to just directly include
<type_traits>.

[bsalomon, 2016/02/09 15:21:38]

Oops, I did that change locally and then never uploaded it. Will submit it as a
separate change.

 
 extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////
 
 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLActiveTextureProc)(GrGLenum texture);
 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLAttachShaderProc)(GrGLuint program, GrGLuint shader);
 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBeginQueryProc)(GrGLenum target, GrGLuint id);
 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindAttribLocationProc)(GrGLuint program, GrGLuint index, const char* name);
 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLBindBufferProc)(GrGLenum target, GrGLuint buffer);
@@ skipping 321 matching lines @@
 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLPopDebugGroupProc)();
 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLObjectLabelProc)(GrGLenum identifier, GrGLuint name, GrGLsizei length, const GrGLchar *label);
 
 /** EGL functions */
 typedef const char* (GR_GL_FUNCTION_TYPE* GrEGLQueryStringProc)(GrEGLDisplay dpy, GrEGLint name);
 typedef GrEGLDisplay (GR_GL_FUNCTION_TYPE* GrEGLGetCurrentDisplayProc)();
 typedef GrEGLImage (GR_GL_FUNCTION_TYPE* GrEGLCreateImageProc)(GrEGLDisplay dpy, GrEGLContext ctx, GrEGLenum target, GrEGLClientBuffer buffer, const GrEGLint *attrib_list);
 typedef GrEGLBoolean (GR_GL_FUNCTION_TYPE* GrEGLDestroyImageProc)(GrEGLDisplay dpy, GrEGLImage image);
 }  // extern "C"
 
+template <typename GLPTR> using GrGLFunction =
+    std::function<typename std::remove_pointer<GLPTR>::type>;
+
 #endif