brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl-gtype: add missing gtype macros in intermediate macros

Browse Source 
Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Lionel Landwerlin 2014-02-23 17:24:11 +00:00 committed by Neil Roberts
parent d9c8570f14
commit 3aee3f63c4
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ void
_cogl_buffer_register_buffer_type (const CoglObjectClass *klass); _cogl_buffer_register_buffer_type (const CoglObjectClass *klass);
#define COGL_BUFFER_DEFINE(TypeName, type_name) \ #define COGL_BUFFER_DEFINE(TypeName, type_name) \
COGL_OBJECT_DEFINE_WITH_CODE_GTYPE \ COGL_OBJECT_DEFINE_WITH_CODE \
(TypeName, type_name, \ (TypeName, type_name, \
_cogl_buffer_register_buffer_type (&_cogl_##type_name##_class)) _cogl_buffer_register_buffer_type (&_cogl_##type_name##_class))

6
cogl/cogl-framebuffer.c
View File

@ -65,9 +65,9 @@ static CoglUserDataKey wire_pipeline_key;
static void _cogl_offscreen_free (CoglOffscreen *offscreen); static void _cogl_offscreen_free (CoglOffscreen *offscreen);
COGL_OBJECT_DEFINE_WITH_CODE (Offscreen, offscreen, COGL_OBJECT_DEFINE_WITH_CODE_GTYPE (Offscreen, offscreen,
_cogl_offscreen_class.virt_unref = _cogl_offscreen_class.virt_unref =
_cogl_framebuffer_unref); _cogl_framebuffer_unref);
COGL_GTYPE_DEFINE_CLASS (Offscreen, offscreen); COGL_GTYPE_DEFINE_CLASS (Offscreen, offscreen);
COGL_OBJECT_DEFINE_DEPRECATED_REF_COUNTING (offscreen); COGL_OBJECT_DEFINE_DEPRECATED_REF_COUNTING (offscreen);
COGL_GTYPE_DEFINE_INTERFACE (Framebuffer, framebuffer); COGL_GTYPE_DEFINE_INTERFACE (Framebuffer, framebuffer);

4
cogl/cogl-object-private.h
View File

@ -221,9 +221,7 @@ cogl_is_##type_name (void *object) \
#define COGL_OBJECT_DEFINE_WITH_CODE(TypeName, type_name, code) \ #define COGL_OBJECT_DEFINE_WITH_CODE(TypeName, type_name, code) \
\ \
COGL_OBJECT_COMMON_DEFINE_WITH_CODE(TypeName, \ COGL_OBJECT_COMMON_DEFINE_WITH_CODE(TypeName, type_name, code) \
type_name, \
do { code; } while (0);) \
\ \
CoglBool \ CoglBool \
cogl_is_##type_name (void *object) \ cogl_is_##type_name (void *object) \

6
cogl/cogl-onscreen.c
View File

@ -46,9 +46,9 @@
static void _cogl_onscreen_free (CoglOnscreen *onscreen); static void _cogl_onscreen_free (CoglOnscreen *onscreen);
COGL_OBJECT_DEFINE_WITH_CODE (Onscreen, onscreen, COGL_OBJECT_DEFINE_WITH_CODE_GTYPE (Onscreen, onscreen,
_cogl_onscreen_class.virt_unref = _cogl_onscreen_class.virt_unref =
_cogl_framebuffer_unref); _cogl_framebuffer_unref);
COGL_GTYPE_DEFINE_CLASS (Onscreen, onscreen, COGL_GTYPE_DEFINE_CLASS (Onscreen, onscreen,
COGL_GTYPE_IMPLEMENT_INTERFACE (framebuffer)); COGL_GTYPE_IMPLEMENT_INTERFACE (framebuffer));