diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-02 15:31:14 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-02 14:03:43 +0000 |
| commit | 3f8994c671d1cfc674ab64e118304b897a84762c (patch) | |
| tree | 82508afadc2e0d011fe342c77632482e37743b36 | |
| parent | a4ecaddc7c4a787a1ebdba8a181847eca6dbd9a1 (diff) | |
[Backport] Use newer GrGLFunction based on templated function types rather than pointers.v5.12.0-beta2v5.12.0-beta1
Allows https://skia-review.googlesource.com/c/skia/+/154501 to land.
Bug: skia:8262
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ic1a9a6753814a5e6dbdfd057f6a96dbcb152e3b6
Reviewed-on: https://chromium-review.googlesource.com/1224660
Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Cr-Commit-Position: refs/heads/master@{#594810}
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc | 7 | ||||
| -rw-r--r-- | chromium/ui/gl/init/create_gr_gl_interface.cc | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chromium/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc b/chromium/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc index ce78575c3fc..42f70c9550f 100644 --- a/chromium/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc +++ b/chromium/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc @@ -26,9 +26,10 @@ class ScopedCallingGLFromSkia { }; template <typename R, typename... Args> -GrGLFunction<R (*)(Args...)> gles_bind(R (GLES2Interface::*func)(Args...), - GLES2Interface* gles2_interface, - ContextSupport* context_support) { +GrGLFunction<R GR_GL_FUNCTION_TYPE(Args...)> gles_bind( + R (GLES2Interface::*func)(Args...), + GLES2Interface* gles2_interface, + ContextSupport* context_support) { if (context_support->HasGrContextSupport()) { return [func, context_support, gles2_interface](Args... args) { ScopedCallingGLFromSkia guard(context_support); diff --git a/chromium/ui/gl/init/create_gr_gl_interface.cc b/chromium/ui/gl/init/create_gr_gl_interface.cc index 72634546e46..61e133f848f 100644 --- a/chromium/ui/gl/init/create_gr_gl_interface.cc +++ b/chromium/ui/gl/init/create_gr_gl_interface.cc @@ -12,8 +12,8 @@ namespace init { namespace { template <typename R, typename... Args> -GrGLFunction<R (*)(Args...)> bind(R (gl::GLApi::*func)(Args...), - gl::GLApi* api) { +GrGLFunction<R GR_GL_FUNCTION_TYPE(Args...)> bind(R (gl::GLApi::*func)(Args...), + gl::GLApi* api) { return [func, api](Args... args) { return (api->*func)(args...); }; } @@ -63,7 +63,7 @@ sk_sp<GrGLInterface> CreateGrGLInterface( // by the bindings (GL 3.2 or ES 3.0), and blacklist extensions that skia // handles but bindings don't. // TODO(piman): add bindings for missing entrypoints. - GrGLFunction<GrGLGetStringProc> get_string; + GrGLFunction<GrGLGetStringFn> get_string; const bool apply_version_override = use_version_es2 || version_info.IsAtLeastGL(3, 3) || version_info.IsAtLeastGLES(3, 1); |