isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: remove CoglFuncPtr, use GCallback instead

Browse Source 
They literally mean the same thing, so we shouldn't reinvent the wheel.
This commit is contained in:
Niels De Graef 2018-11-30 15:04:45 +01:00 committed by Jonas Ådahl
parent c5471e5b8b
commit 9004253c4e
7 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cogl/cogl/cogl-types.h
View File

@ -125,15 +125,6 @@ cogl_handle_ref (CoglHandle handle);
void void
cogl_handle_unref (CoglHandle handle); cogl_handle_unref (CoglHandle handle);
/**
* CoglFuncPtr:
*
* The type used by cogl for function pointers, note that this type
* is used as a generic catch-all cast for function pointers and the
* actual arguments and return type may be different.
*/
typedef void (* CoglFuncPtr) (void);
/* We forward declare this in cogl-types to avoid circular dependencies /* We forward declare this in cogl-types to avoid circular dependencies
* between cogl-matrix.h, cogl-euler.h and cogl-quaterion.h */ * between cogl-matrix.h, cogl-euler.h and cogl-quaterion.h */
typedef struct _CoglMatrix CoglMatrix; typedef struct _CoglMatrix CoglMatrix;

2
cogl/cogl/cogl.c
View File

@ -59,7 +59,7 @@
#include "deprecated/cogl-framebuffer-deprecated.h" #include "deprecated/cogl-framebuffer-deprecated.h"
CoglFuncPtr GCallback
cogl_get_proc_address (const char* name) cogl_get_proc_address (const char* name)
{ {
_COGL_GET_CONTEXT (ctx, NULL); _COGL_GET_CONTEXT (ctx, NULL);

2
cogl/cogl/cogl1-context.h
View File

@ -106,7 +106,7 @@ cogl_features_available (CoglFeatureFlags features);
* Return value: a pointer to the requested function or %NULL if the * Return value: a pointer to the requested function or %NULL if the
* function is not available. * function is not available.
*/ */
CoglFuncPtr GCallback
cogl_get_proc_address (const char *name); cogl_get_proc_address (const char *name);
/** /**

2
cogl/cogl/winsys/cogl-winsys-egl.c
View File

@ -138,7 +138,7 @@ get_error_string (void)
} }
} }
static CoglFuncPtr static GCallback
_cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer, _cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer,
const char *name, const char *name,
CoglBool in_core) CoglBool in_core)

2
cogl/cogl/winsys/cogl-winsys-glx.c
View File

@ -166,7 +166,7 @@ static const CoglFeatureData winsys_feature_data[] =
#include "winsys/cogl-winsys-glx-feature-functions.h" #include "winsys/cogl-winsys-glx-feature-functions.h"
}; };
static CoglFuncPtr static GCallback
_cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer, _cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer,
const char *name, const char *name,
CoglBool in_core) CoglBool in_core)

2
cogl/cogl/winsys/cogl-winsys-private.h
View File

@ -79,7 +79,7 @@ typedef struct _CoglWinsysVtable
/* Required functions */ /* Required functions */
CoglFuncPtr GCallback
(*renderer_get_proc_address) (CoglRenderer *renderer, (*renderer_get_proc_address) (CoglRenderer *renderer,
const char *name, const char *name,
CoglBool in_core); CoglBool in_core);

2
cogl/cogl/winsys/cogl-winsys-stub.c
View File

@ -49,7 +49,7 @@ static int _cogl_winsys_stub_dummy_ptr;
* integration code. * integration code.
*/ */
static CoglFuncPtr static GCallback
_cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer, _cogl_winsys_renderer_get_proc_address (CoglRenderer *renderer,
const char *name, const char *name,
CoglBool in_core) CoglBool in_core)