diff options
Diffstat (limited to 'chromium/third_party/skia/src/gpu')
4 files changed, 29 insertions, 23 deletions
diff --git a/chromium/third_party/skia/src/gpu/gl/GrGLAssembleInterface.cpp b/chromium/third_party/skia/src/gpu/gl/GrGLAssembleInterface.cpp index 5c5e05a1667..06e20ac716a 100644 --- a/chromium/third_party/skia/src/gpu/gl/GrGLAssembleInterface.cpp +++ b/chromium/third_party/skia/src/gpu/gl/GrGLAssembleInterface.cpp @@ -9,11 +9,11 @@ #include "gl/GrGLAssembleInterface.h" #include "GrGLUtil.h" -#define GET_PROC(F) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F) -#define GET_PROC_SUFFIX(F, S) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F #S) -#define GET_PROC_LOCAL(F) GrGL ## F ## Proc F = (GrGL ## F ## Proc) get(ctx, "gl" #F) +#define GET_PROC(F) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F) +#define GET_PROC_SUFFIX(F, S) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F #S) +#define GET_PROC_LOCAL(F) GrGL##F##Fn* F = (GrGL##F##Fn*)get(ctx, "gl" #F) -#define GET_EGL_PROC_SUFFIX(F, S) functions->fEGL ## F = (GrEGL ## F ## Proc) get(ctx, "egl" #F #S) +#define GET_EGL_PROC_SUFFIX(F, S) functions->fEGL##F = (GrEGL##F##Fn*)get(ctx, "egl" #F #S) sk_sp<const GrGLInterface> GrGLMakeAssembledInterface(void *ctx, GrGLGetProc get) { GET_PROC_LOCAL(GetString); @@ -36,13 +36,13 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledInterface(void *ctx, GrGLGetProc get return nullptr; } -static void get_egl_query_and_display(GrEGLQueryStringProc* queryString, GrEGLDisplay* display, +static void get_egl_query_and_display(GrEGLQueryStringFn** queryString, GrEGLDisplay* display, void* ctx, GrGLGetProc get) { - *queryString = (GrEGLQueryStringProc) get(ctx, "eglQueryString"); + *queryString = (GrEGLQueryStringFn*)get(ctx, "eglQueryString"); *display = GR_EGL_NO_DISPLAY; if (*queryString) { - GrEGLGetCurrentDisplayProc getCurrentDisplay = - (GrEGLGetCurrentDisplayProc) get(ctx, "eglGetCurrentDisplay"); + GrEGLGetCurrentDisplayFn* getCurrentDisplay = + (GrEGLGetCurrentDisplayFn*)get(ctx, "eglGetCurrentDisplay"); if (getCurrentDisplay) { *display = getCurrentDisplay(); } else { @@ -69,7 +69,7 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc g return nullptr; } - GrEGLQueryStringProc queryString; + GrEGLQueryStringFn* queryString; GrEGLDisplay display; get_egl_query_and_display(&queryString, &display, ctx, get); GrGLExtensions extensions; @@ -429,7 +429,7 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc GET_PROC_LOCAL(GetIntegerv); GET_PROC_LOCAL(GetStringi); - GrEGLQueryStringProc queryString; + GrEGLQueryStringFn* queryString; GrEGLDisplay display; get_egl_query_and_display(&queryString, &display, ctx, get); GrGLExtensions extensions; @@ -666,12 +666,18 @@ sk_sp<const GrGLInterface> GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc if (extensions.has("GL_EXT_multisampled_render_to_texture")) { GET_PROC_SUFFIX(FramebufferTexture2DMultisample, EXT); - functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) get(ctx, "glRenderbufferStorageMultisampleEXT"); + functions->fRenderbufferStorageMultisampleES2EXT = + (GrGLRenderbufferStorageMultisampleFn*)get(ctx, + "glRenderbufferStorageMultisampleEXT"); } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) { GET_PROC_SUFFIX(FramebufferTexture2DMultisample, IMG); - functions->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStorageMultisampleProc) get(ctx, "glRenderbufferStorageMultisampleIMG"); + functions->fRenderbufferStorageMultisampleES2EXT = + (GrGLRenderbufferStorageMultisampleFn*)get(ctx, + "glRenderbufferStorageMultisampleIMG"); } else if (extensions.has("GL_APPLE_framebuffer_multisample")) { - functions->fRenderbufferStorageMultisampleES2APPLE = (GrGLRenderbufferStorageMultisampleProc) get(ctx, "glRenderbufferStorageMultisampleAPPLE"); + functions->fRenderbufferStorageMultisampleES2APPLE = + (GrGLRenderbufferStorageMultisampleFn*)get(ctx, + "glRenderbufferStorageMultisampleAPPLE"); GET_PROC_SUFFIX(ResolveMultisampleFramebuffer, APPLE); } diff --git a/chromium/third_party/skia/src/gpu/gl/GrGLExtensions.cpp b/chromium/third_party/skia/src/gpu/gl/GrGLExtensions.cpp index 6530eaf899e..b6898c4f40e 100644 --- a/chromium/third_party/skia/src/gpu/gl/GrGLExtensions.cpp +++ b/chromium/third_party/skia/src/gpu/gl/GrGLExtensions.cpp @@ -66,10 +66,10 @@ static void eat_space_sep_strings(SkTArray<SkString>* out, const char in[]) { } bool GrGLExtensions::init(GrGLStandard standard, - GrGLFunction<GrGLGetStringProc> getString, - GrGLFunction<GrGLGetStringiProc> getStringi, - GrGLFunction<GrGLGetIntegervProc> getIntegerv, - GrGLFunction<GrEGLQueryStringProc> queryString, + GrGLFunction<GrGLGetStringFn> getString, + GrGLFunction<GrGLGetStringiFn> getStringi, + GrGLFunction<GrGLGetIntegervFn> getIntegerv, + GrGLFunction<GrEGLQueryStringFn> queryString, GrEGLDisplay eglDisplay) { fInitialized = false; fStrings.reset(); diff --git a/chromium/third_party/skia/src/gpu/gl/GrGLTestInterface.cpp b/chromium/third_party/skia/src/gpu/gl/GrGLTestInterface.cpp index 38740482f38..e44deecf902 100644 --- a/chromium/third_party/skia/src/gpu/gl/GrGLTestInterface.cpp +++ b/chromium/third_party/skia/src/gpu/gl/GrGLTestInterface.cpp @@ -8,11 +8,11 @@ #include "GrGLTestInterface.h" namespace { - template<typename R, typename... A> - GrGLFunction<R(*)(A...)> bind_to_member(GrGLTestInterface* interface, - R (GrGLTestInterface::*member)(A...)) { - return [interface, member] (A... a) -> R { return (interface->*member)(a...); }; - } +template <typename R, typename... A> +GrGLFunction<R GR_GL_FUNCTION_TYPE(A...)> bind_to_member(GrGLTestInterface* interface, + R (GrGLTestInterface::*member)(A...)) { + return [interface, member](A... a) -> R { return (interface->*member)(a...); }; +} } // anonymous namespace GrGLTestInterface::GrGLTestInterface() { diff --git a/chromium/third_party/skia/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp b/chromium/third_party/skia/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp index 2a2ceddc96f..3b5951f502c 100644 --- a/chromium/third_party/skia/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp +++ b/chromium/third_party/skia/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp @@ -72,7 +72,7 @@ sk_sp<const GrGLInterface> GrGLMakeNativeInterface() { return nullptr; } - GrGLGetStringProc getString = (GrGLGetStringProc)getter.getProc("glGetString"); + GrGLGetStringFn* getString = (GrGLGetStringFn*)getter.getProc("glGetString"); if (nullptr == getString) { return nullptr; } |