From 94f509b5042c29540d0b4ef255798b8daed5ace6 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 11 Dec 2017 16:36:53 -0500 Subject: Rename GrGLAssembleFooInterface to GrGLMakeAssembledFooInterface. Add GrGLAssembleInterface with legacy bare pointer return. This allows existing clients of GrGLAssembleInterface to roll Skia without code changes. Change-Id: I0764a9f4583e554fff5574889adcc6fe004db159 Reviewed-on: https://skia-review.googlesource.com/83564 Commit-Queue: Brian Salomon Reviewed-by: Brian Salomon --- include/gpu/gl/GrGLAssembleInterface.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/gpu/gl/GrGLAssembleInterface.h b/include/gpu/gl/GrGLAssembleInterface.h index db44ce738f..42f842e2b8 100644 --- a/include/gpu/gl/GrGLAssembleInterface.h +++ b/include/gpu/gl/GrGLAssembleInterface.h @@ -13,17 +13,20 @@ typedef GrGLFuncPtr (*GrGLGetProc)(void* ctx, const char name[]); * Generic function for creating a GrGLInterface for an either OpenGL or GLES. It calls * get() to get each function address. ctx is a generic ptr passed to and interpreted by get(). */ -SK_API sk_sp GrGLAssembleInterface(void* ctx, GrGLGetProc get); +SK_API sk_sp GrGLMakeAssembledInterface(void *ctx, GrGLGetProc get); /** * Generic function for creating a GrGLInterface for an OpenGL (but not GLES) context. It calls * get() to get each function address. ctx is a generic ptr passed to and interpreted by get(). */ -SK_API sk_sp GrGLAssembleGLInterface(void* ctx, GrGLGetProc get); +SK_API sk_sp GrGLMakeAssembledGLInterface(void *ctx, GrGLGetProc get); /** * Generic function for creating a GrGLInterface for an OpenGL ES (but not Open GL) context. It * calls get() to get each function address. ctx is a generic ptr passed to and interpreted by * get(). */ -SK_API sk_sp GrGLAssembleGLESInterface(void* ctx, GrGLGetProc get); +SK_API sk_sp GrGLMakeAssembledGLESInterface(void *ctx, GrGLGetProc get); + +/** Deprecated version of GrGLMakeAssembledInterface() that returns a bare pointer. */ +SK_API const GrGLInterface* GrGLAssembleInterface(void *ctx, GrGLGetProc get); -- cgit v1.2.3