[mutter] cogl/pango: Remove deprecated API using implicit fb stack
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl/pango: Remove deprecated API using implicit fb stack
- Date: Tue, 3 Dec 2019 19:13:38 +0000 (UTC)
commit 66f02ae93d379dd4cea7b544a8dd910bbfbb5288
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Wed Nov 20 22:13:47 2019 +0100
cogl/pango: Remove deprecated API using implicit fb stack
Remove the implicit framebuffer stack using cogl_pango_render_*() API
that was replaced with the newer cogl_pango_show_*() API.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/935
cogl/cogl-pango/cogl-pango-render.c | 41 -----------------------
cogl/cogl-pango/cogl-pango.h | 65 -------------------------------------
cogl/cogl-pango/cogl-pango.symbols | 3 --
3 files changed, 109 deletions(-)
---
diff --git a/cogl/cogl-pango/cogl-pango-render.c b/cogl/cogl-pango/cogl-pango-render.c
index 8df69637c..dedc0433f 100644
--- a/cogl/cogl-pango/cogl-pango-render.c
+++ b/cogl/cogl-pango/cogl-pango-render.c
@@ -454,34 +454,6 @@ cogl_pango_show_layout (CoglFramebuffer *fb,
}
}
-void
-cogl_pango_render_layout_subpixel (PangoLayout *layout,
- int x,
- int y,
- const CoglColor *color,
- int flags)
-{
- cogl_pango_show_layout (cogl_get_draw_framebuffer (),
- layout,
- x / (float) PANGO_SCALE,
- y / (float) PANGO_SCALE,
- color);
-}
-
-void
-cogl_pango_render_layout (PangoLayout *layout,
- int x,
- int y,
- const CoglColor *color,
- int flags)
-{
- cogl_pango_render_layout_subpixel (layout,
- x * PANGO_SCALE,
- y * PANGO_SCALE,
- color,
- flags);
-}
-
void
cogl_pango_show_layout_line (CoglFramebuffer *fb,
PangoLayoutLine *line,
@@ -519,19 +491,6 @@ cogl_pango_show_layout_line (CoglFramebuffer *fb,
priv->display_list = NULL;
}
-void
-cogl_pango_render_layout_line (PangoLayoutLine *line,
- int x,
- int y,
- const CoglColor *color)
-{
- cogl_pango_show_layout_line (cogl_get_draw_framebuffer (),
- line,
- x / (float) PANGO_SCALE,
- y / (float) PANGO_SCALE,
- color);
-}
-
void
_cogl_pango_renderer_clear_glyph_cache (CoglPangoRenderer *renderer)
{
diff --git a/cogl/cogl-pango/cogl-pango.h b/cogl/cogl-pango/cogl-pango.h
index 4559eca15..bd265fa93 100644
--- a/cogl/cogl-pango/cogl-pango.h
+++ b/cogl/cogl-pango/cogl-pango.h
@@ -229,71 +229,6 @@ typedef struct _CoglPangoRendererClass CoglPangoRendererClass;
GType cogl_pango_renderer_get_type (void) G_GNUC_CONST;
-/**
- * cogl_pango_render_layout_subpixel:
- * @layout: a #PangoLayout
- * @x: X coordinate (in Pango units) to render the layout at
- * @y: Y coordinate (in Pango units) to render the layout at
- * @color: color to use when rendering the layout
- * @flags:
- *
- * Draws a solidly coloured @layout on the given @framebuffer at (@x,
- * @y) within the @framebuffer<!-- -->'s current model-view coordinate
- * space.
- *
- * Since: 1.0
- * Deprecated: 1.16: Use cogl_pango_show_layout() instead
- */
-COGL_DEPRECATED_FOR (cogl_pango_show_layout)
-void
-cogl_pango_render_layout_subpixel (PangoLayout *layout,
- int x,
- int y,
- const CoglColor *color,
- int flags);
-
-/**
- * cogl_pango_render_layout:
- * @layout: a #PangoLayout
- * @x: X coordinate to render the layout at
- * @y: Y coordinate to render the layout at
- * @color: color to use when rendering the layout
- * @flags:
- *
- * Draws a solidly coloured @layout on the given @framebuffer at (@x,
- * @y) within the @framebuffer<!-- -->'s current model-view coordinate
- * space.
- *
- * Since: 1.0
- * Deprecated: 1.16: Use cogl_pango_show_layout() instead
- */
-COGL_DEPRECATED_FOR (cogl_pango_show_layout)
-void
-cogl_pango_render_layout (PangoLayout *layout,
- int x,
- int y,
- const CoglColor *color,
- int flags);
-
-/**
- * cogl_pango_render_layout_line:
- * @line: a #PangoLayoutLine
- * @x: X coordinate to render the line at
- * @y: Y coordinate to render the line at
- * @color: color to use when rendering the line
- *
- * Renders @line at the given coordinates using the given color.
- *
- * Since: 1.0
- * Deprecated: 1.16: Use cogl_pango_show_layout() instead
- */
-COGL_DEPRECATED_FOR (cogl_pango_show_layout_line)
-void
-cogl_pango_render_layout_line (PangoLayoutLine *line,
- int x,
- int y,
- const CoglColor *color);
-
G_END_DECLS
#endif /* __COGL_PANGO_H__ */
diff --git a/cogl/cogl-pango/cogl-pango.symbols b/cogl/cogl-pango/cogl-pango.symbols
index b86c9560e..33258b895 100644
--- a/cogl/cogl-pango/cogl-pango.symbols
+++ b/cogl/cogl-pango/cogl-pango.symbols
@@ -7,6 +7,3 @@ cogl_pango_font_map_new
cogl_pango_font_map_set_resolution
cogl_pango_font_map_set_use_mipmapping
cogl_pango_renderer_get_type
-cogl_pango_render_layout
-cogl_pango_render_layout_line
-cogl_pango_render_layout_subpixel
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]