sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl/cleanup: Replace CoglUserDataDestroyCallback with GDestroyNotify

Browse source 
It is just a typedef

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3193>
This commit is contained in:
Bilal Elmoussaoui 2023-09-19 11:23:02 +02:00 committed by Marge Bot
parent b044e26e62
commit b4bd69e4e8
7 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cogl/cogl/cogl-closure-list-private.h
View file

@ -54,7 +54,7 @@ typedef struct _CoglClosure
void *function; void *function;
void *user_data; void *user_data;
CoglUserDataDestroyCallback destroy_cb; GDestroyNotify destroy_cb;
} CoglClosure; } CoglClosure;
/* /*
@ -74,7 +74,7 @@ CoglClosure *
_cogl_closure_list_add (CoglList *list, _cogl_closure_list_add (CoglList *list,
void *function, void *function,
void *user_data, void *user_data,
CoglUserDataDestroyCallback destroy_cb); GDestroyNotify destroy_cb);
/* /*
* _cogl_closure_list_invoke: * _cogl_closure_list_invoke:

2
cogl/cogl/cogl-closure-list.c
View file

@ -57,7 +57,7 @@ CoglClosure *
_cogl_closure_list_add (CoglList *list, _cogl_closure_list_add (CoglList *list,
void *function, void *function,
void *user_data, void *user_data,
CoglUserDataDestroyCallback destroy_cb) GDestroyNotify destroy_cb)
{ {
CoglClosure *closure = g_new0 (CoglClosure, 1); CoglClosure *closure = g_new0 (CoglClosure, 1);

12
cogl/cogl/cogl-object.h
View file

@ -89,18 +89,6 @@ cogl_object_unref (void *object);
*/ */
#define cogl_clear_object(object_ptr) g_clear_pointer ((object_ptr), cogl_object_unref) #define cogl_clear_object(object_ptr) g_clear_pointer ((object_ptr), cogl_object_unref)
/**
* CoglUserDataDestroyCallback:
* @user_data: The data whose association with a #CoglObject has been
* destroyed.
*
* When associating private data with a #CoglObject a callback can be
* given which will be called either if the object is destroyed or if
* cogl_object_set_user_data() is called with NULL user_data for the
* same key.
*/
typedef GDestroyNotify CoglUserDataDestroyCallback;
/** /**
* CoglDebugObjectTypeInfo: * CoglDebugObjectTypeInfo:
* @name: A human readable name for the type. * @name: A human readable name for the type.

4
cogl/cogl/cogl-onscreen.c
View file

@ -514,7 +514,7 @@ CoglFrameClosure *
cogl_onscreen_add_frame_callback (CoglOnscreen *onscreen, cogl_onscreen_add_frame_callback (CoglOnscreen *onscreen,
CoglFrameCallback callback, CoglFrameCallback callback,
void *user_data, void *user_data,
CoglUserDataDestroyCallback destroy) GDestroyNotify destroy)
{ {
CoglOnscreenPrivate *priv = cogl_onscreen_get_instance_private (onscreen); CoglOnscreenPrivate *priv = cogl_onscreen_get_instance_private (onscreen);
@ -564,7 +564,7 @@ CoglOnscreenDirtyClosure *
cogl_onscreen_add_dirty_callback (CoglOnscreen *onscreen, cogl_onscreen_add_dirty_callback (CoglOnscreen *onscreen,
CoglOnscreenDirtyCallback callback, CoglOnscreenDirtyCallback callback,
void *user_data, void *user_data,
CoglUserDataDestroyCallback destroy) GDestroyNotify destroy)
{ {
CoglOnscreenPrivate *priv = cogl_onscreen_get_instance_private (onscreen); CoglOnscreenPrivate *priv = cogl_onscreen_get_instance_private (onscreen);

4
cogl/cogl/cogl-onscreen.h
View file

@ -444,7 +444,7 @@ COGL_EXPORT CoglFrameClosure *
cogl_onscreen_add_frame_callback (CoglOnscreen *onscreen, cogl_onscreen_add_frame_callback (CoglOnscreen *onscreen,
CoglFrameCallback callback, CoglFrameCallback callback,
void *user_data, void *user_data,
CoglUserDataDestroyCallback destroy); GDestroyNotify destroy);
/** /**
* cogl_onscreen_remove_frame_callback: * cogl_onscreen_remove_frame_callback:
@ -549,7 +549,7 @@ COGL_EXPORT CoglOnscreenDirtyClosure *
cogl_onscreen_add_dirty_callback (CoglOnscreen *onscreen, cogl_onscreen_add_dirty_callback (CoglOnscreen *onscreen,
CoglOnscreenDirtyCallback callback, CoglOnscreenDirtyCallback callback,
void *user_data, void *user_data,
CoglUserDataDestroyCallback destroy); GDestroyNotify destroy);
/** /**
* cogl_onscreen_remove_dirty_callback: * cogl_onscreen_remove_dirty_callback:

2
cogl/cogl/cogl-poll-private.h
View file

@ -62,4 +62,4 @@ COGL_EXPORT CoglClosure *
_cogl_poll_renderer_add_idle (CoglRenderer *renderer, _cogl_poll_renderer_add_idle (CoglRenderer *renderer,
CoglIdleCallback idle_cb, CoglIdleCallback idle_cb,
void *user_data, void *user_data,
CoglUserDataDestroyCallback destroy_cb); GDestroyNotify destroy_cb);

2
cogl/cogl/cogl-poll.c
View file

@ -219,7 +219,7 @@ CoglClosure *
_cogl_poll_renderer_add_idle (CoglRenderer *renderer, _cogl_poll_renderer_add_idle (CoglRenderer *renderer,
CoglIdleCallback idle_cb, CoglIdleCallback idle_cb,
void *user_data, void *user_data,
CoglUserDataDestroyCallback destroy_cb) GDestroyNotify destroy_cb)
{ {
return _cogl_closure_list_add (&renderer->idle_closures, return _cogl_closure_list_add (&renderer->idle_closures,
idle_cb, idle_cb,