From a1d0b300701a662f59fb051c945e67ddb20031aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Mon, 5 May 2008 12:01:19 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++ clutter/cogl/common/cogl-primitives.c | 50 +++++++++++++++++++++++++++++++++++ clutter/cogl/gl/cogl-primitives.c | 41 +++++++--------------------- clutter/cogl/gles/cogl-primitives.c | 42 +++++++---------------------- 4 files changed, 77 insertions(+), 64 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98d998b..6741681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-05-05 Øyvind Kolås + * 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 + * clutter/cogl/cogl.h.in: api review touch ups. * clutter/cogl/common/cogl-primitives.c: api review touch ups. * clutter/cogl/gl/cogl-primitives.c: (cogl_path_fill), diff --git a/clutter/cogl/common/cogl-primitives.c b/clutter/cogl/common/cogl-primitives.c index cf0cfc6..e956413 100644 --- a/clutter/cogl/common/cogl-primitives.c +++ b/clutter/cogl/common/cogl-primitives.c @@ -40,6 +40,56 @@ void _cogl_path_clear_nodes (); void _cogl_path_add_node (ClutterFixed x, 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 cogl_path_move_to (ClutterFixed x, diff --git a/clutter/cogl/gl/cogl-primitives.c b/clutter/cogl/gl/cogl-primitives.c index 0ce1f97..70e0055 100644 --- a/clutter/cogl/gl/cogl-primitives.c +++ b/clutter/cogl/gl/cogl-primitives.c @@ -37,10 +37,10 @@ #define _COGL_MAX_BEZ_RECURSE_DEPTH 16 void -cogl_rectangle (gint x, - gint y, - guint width, - guint height) +_cogl_rectangle (gint x, + gint y, + guint width, + guint height) { _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -52,10 +52,10 @@ cogl_rectangle (gint x, void -cogl_rectanglex (ClutterFixed x, - ClutterFixed y, - ClutterFixed width, - ClutterFixed height) +_cogl_rectanglex (ClutterFixed x, + ClutterFixed y, + ClutterFixed width, + ClutterFixed height) { _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -132,7 +132,7 @@ _cogl_path_stroke_nodes () GE( glDrawArrays (GL_LINE_STRIP, 0, ctx->path_nodes_size) ); } -static void +void _cogl_path_fill_nodes () { _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -168,26 +168,3 @@ _cogl_path_fill_nodes () 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(); -} diff --git a/clutter/cogl/gles/cogl-primitives.c b/clutter/cogl/gles/cogl-primitives.c index 2e74817..08b79c2 100644 --- a/clutter/cogl/gles/cogl-primitives.c +++ b/clutter/cogl/gles/cogl-primitives.c @@ -37,10 +37,10 @@ #define _COGL_MAX_BEZ_RECURSE_DEPTH 16 void -cogl_rectangle (gint x, - gint y, - guint width, - guint height) +_cogl_rectangle (gint x, + gint y, + guint width, + guint height) { _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -63,10 +63,10 @@ cogl_rectangle (gint x, void -cogl_rectanglex (ClutterFixed x, - ClutterFixed y, - ClutterFixed width, - ClutterFixed height) +_cogl_rectanglex (ClutterFixed x, + ClutterFixed y, + ClutterFixed width, + ClutterFixed height) { _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -138,7 +138,7 @@ _cogl_path_add_node (ClutterFixed x, } } -static void +void _cogl_path_stroke_nodes () { _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); } -static void +void _cogl_path_fill_nodes () { _COGL_GET_CONTEXT (ctx, NO_RETVAL); @@ -355,25 +355,3 @@ fill_close: #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(); -} -- 2.7.4