diff --git a/cogl/cogl-path/cogl-path-functions.h b/cogl/cogl-path/cogl-path-functions.h index 318fed028..96ed23168 100644 --- a/cogl/cogl-path/cogl-path-functions.h +++ b/cogl/cogl-path/cogl-path-functions.h @@ -422,26 +422,6 @@ cogl_path_set_fill_rule (CoglPath *path, CoglPathFillRule fill_rule); CoglPathFillRule cogl_path_get_fill_rule (CoglPath *path); -#define cogl_path_fill cogl2_path_fill -/** - * cogl_path_fill: - * - * Fills the interior of the constructed shape using the current - * drawing color. - * - * The interior of the shape is determined using the fill rule of the - * path. See %CoglPathFillRule for details. - * - * The result of referencing sliced textures in your current - * pipeline when filling a path are undefined. You should pass - * the %COGL_TEXTURE_NO_SLICING flag when loading any texture you will - * use while filling a path. - * - * Since: 2.0 - */ -void -cogl_path_fill (CoglPath *path); - /** * cogl_framebuffer_fill_path: * @framebuffer: A #CoglFramebuffer @@ -466,19 +446,6 @@ cogl_framebuffer_fill_path (CoglFramebuffer *framebuffer, CoglPipeline *pipeline, CoglPath *path); -#define cogl_path_stroke cogl2_path_stroke -/** - * cogl_path_stroke: - * - * Strokes the constructed shape using the current drawing color and a - * width of 1 pixel (regardless of the current transformation - * matrix). - * - * Since: 2.0 - */ -void -cogl_path_stroke (CoglPath *path); - /** * cogl_framebuffer_stroke_path: * @framebuffer: A #CoglFramebuffer @@ -513,22 +480,6 @@ void cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer, CoglPath *path); -#define cogl_clip_push_from_path cogl2_clip_push_from_path -/** - * cogl_clip_push_from_path: - * @path: The path to clip with. - * - * Sets a new clipping area using the silhouette of the specified, - * filled @path. The clipping area is intersected with the previous - * clipping area. To restore the previous clipping area, call - * call cogl_clip_pop(). - * - * Since: 1.8 - * Stability: Unstable - */ -void -cogl_clip_push_from_path (CoglPath *path); - G_END_DECLS #endif /* __COGL_PATH_FUNCTIONS_H__ */ diff --git a/cogl/cogl-path/cogl-path.c b/cogl/cogl-path/cogl-path.c index 91e78aa09..18a9eace9 100644 --- a/cogl/cogl-path/cogl-path.c +++ b/cogl/cogl-path/cogl-path.c @@ -385,38 +385,6 @@ _cogl_path_fill_nodes (CoglPath *path, } } -/* TODO: Update to the protoype used in the Cogl master branch. - * This is experimental API but not in sync with the cogl_path_fill() - * api in Cogl master which takes explicit framebuffer and pipeline - * arguments */ -void -cogl2_path_fill (CoglPath *path) -{ - g_return_if_fail (cogl_is_path (path)); - - _cogl_path_fill_nodes (path, - cogl_get_draw_framebuffer (), - cogl_get_source (), - 0 /* flags */); -} - -/* TODO: Update to the protoype used in the Cogl master branch. - * This is experimental API but not in sync with the cogl_path_fill() - * api in Cogl master which takes explicit framebuffer and pipeline - * arguments */ -void -cogl2_path_stroke (CoglPath *path) -{ - g_return_if_fail (cogl_is_path (path)); - - if (path->data->path_nodes->len == 0) - return; - - _cogl_path_stroke_nodes (path, - cogl_get_draw_framebuffer (), - cogl_get_source ()); -} - void cogl2_path_move_to (CoglPath *path, float x, @@ -1504,12 +1472,6 @@ cogl_framebuffer_push_path_clip (CoglFramebuffer *framebuffer, COGL_FRAMEBUFFER_STATE_CLIP; } -void -cogl_clip_push_from_path (CoglPath *path) -{ - cogl_framebuffer_push_path_clip (cogl_get_draw_framebuffer (), path); -} - static void _cogl_path_build_stroke_attribute_buffer (CoglPath *path) {