isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-28 22:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

* clutter/cogl/gl/cogl-primitives.c:

Browse Source 
* clutter/cogl/gles/cogl-primitives.c: 
* clutter/cogl/common/cogl-primitives.c: moved declaration of
gegl_rectangle and gegl_rectanglex here to satisfy linking
requirements when building the fruity backend.
This commit is contained in:
Øyvind Kolås 2008-05-05 12:01:19 +00:00
parent 0e6ad06db4
commit a1d0b30070
4 changed files with 77 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-05-05 Øyvind Kolås <pippin@o-hand.com>
* clutter/cogl/gl/cogl-primitives.c:
* clutter/cogl/gles/cogl-primitives.c:
* clutter/cogl/common/cogl-primitives.c: moved declaration of
gegl_rectangle and gegl_rectanglex here to satisfy linking
requirements when building the fruity backend.
2008-05-05 Øyvind Kolås <pippin@o-hand.com> 2008-05-05 Øyvind Kolås <pippin@o-hand.com>
* clutter/cogl/cogl.h.in: api review touch ups. * clutter/cogl/cogl.h.in: api review touch ups.

50
clutter/cogl/common/cogl-primitives.c
View File

@ -40,6 +40,56 @@
void _cogl_path_clear_nodes (); void _cogl_path_clear_nodes ();
void _cogl_path_add_node (ClutterFixed x, void _cogl_path_add_node (ClutterFixed x,
ClutterFixed y); ClutterFixed y);
void _cogl_path_fill_nodes ();
void _cogl_path_stroke_nodes ();
void _cogl_rectangle (gint x,
gint y,
guint width,
guint height);
void _cogl_rectanglex (ClutterFixed x,
ClutterFixed y,
ClutterFixed width,
ClutterFixed height);
void
cogl_rectangle (gint x,
gint y,
guint width,
guint height)
{
_cogl_rectangle (x, y, width, height);
}
void
cogl_rectanglex (ClutterFixed x,
ClutterFixed y,
ClutterFixed width,
ClutterFixed height)
{
_cogl_rectanglex (x, y, width, height);
}
void
cogl_path_fill (void)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (ctx->path_nodes_size == 0)
return;
_cogl_path_fill_nodes();
}
void
cogl_path_stroke (void)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (ctx->path_nodes_size == 0)
return;
_cogl_path_stroke_nodes();
}
void void
cogl_path_move_to (ClutterFixed x, cogl_path_move_to (ClutterFixed x,

41
clutter/cogl/gl/cogl-primitives.c
View File

@ -37,10 +37,10 @@
#define _COGL_MAX_BEZ_RECURSE_DEPTH 16 #define _COGL_MAX_BEZ_RECURSE_DEPTH 16
void void
cogl_rectangle (gint x, _cogl_rectangle (gint x,
gint y, gint y,
guint width, guint width,
guint height) guint height)
{ {
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -52,10 +52,10 @@ cogl_rectangle (gint x,
void void
cogl_rectanglex (ClutterFixed x, _cogl_rectanglex (ClutterFixed x,
ClutterFixed y, ClutterFixed y,
ClutterFixed width, ClutterFixed width,
ClutterFixed height) ClutterFixed height)
{ {
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -132,7 +132,7 @@ _cogl_path_stroke_nodes ()
GE( glDrawArrays (GL_LINE_STRIP, 0, ctx->path_nodes_size) ); GE( glDrawArrays (GL_LINE_STRIP, 0, ctx->path_nodes_size) );
} }
static void void
_cogl_path_fill_nodes () _cogl_path_fill_nodes ()
{ {
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -168,26 +168,3 @@ _cogl_path_fill_nodes ()
GE( glDisable (GL_STENCIL_TEST) ); GE( glDisable (GL_STENCIL_TEST) );
} }
void
cogl_path_fill (void)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (ctx->path_nodes_size == 0)
return;
_cogl_path_fill_nodes();
}
void
cogl_path_stroke (void)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (ctx->path_nodes_size == 0)
return;
_cogl_path_stroke_nodes();
}

42
clutter/cogl/gles/cogl-primitives.c
View File

@ -37,10 +37,10 @@
#define _COGL_MAX_BEZ_RECURSE_DEPTH 16 #define _COGL_MAX_BEZ_RECURSE_DEPTH 16
void void
cogl_rectangle (gint x, _cogl_rectangle (gint x,
gint y, gint y,
guint width, guint width,
guint height) guint height)
{ {
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -63,10 +63,10 @@ cogl_rectangle (gint x,
void void
cogl_rectanglex (ClutterFixed x, _cogl_rectanglex (ClutterFixed x,
ClutterFixed y, ClutterFixed y,
ClutterFixed width, ClutterFixed width,
ClutterFixed height) ClutterFixed height)
{ {
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -138,7 +138,7 @@ _cogl_path_add_node (ClutterFixed x,
} }
} }
static void void
_cogl_path_stroke_nodes () _cogl_path_stroke_nodes ()
{ {
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -157,7 +157,7 @@ static gint compare_ints (gconstpointer a,
return GPOINTER_TO_INT(a)-GPOINTER_TO_INT(b); return GPOINTER_TO_INT(a)-GPOINTER_TO_INT(b);
} }
static void void
_cogl_path_fill_nodes () _cogl_path_fill_nodes ()
{ {
_COGL_GET_CONTEXT (ctx, NO_RETVAL); _COGL_GET_CONTEXT (ctx, NO_RETVAL);
@ -355,25 +355,3 @@ fill_close:
#endif #endif
} }
void
cogl_path_fill (void)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (ctx->path_nodes_size == 0)
return;
_cogl_path_fill_nodes();
}
void
cogl_path_stroke (void)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
if (ctx->path_nodes_size == 0)
return;
_cogl_path_stroke_nodes();
}