diff options
| author | Robert Bragg <robert@linux.intel.com> | 2013-07-09 23:47:29 +0100 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-07-29 18:31:36 +0100 |
| commit | e9f721216e4f7974912b58480e8ca001c82a270a (patch) | |
| tree | ad1a429572dc901867f46487152d89fb3eb67cd1 /cogl/cogl.symbols | |
| parent | 5580baeffb3d811a7519cfdd1baf685d24d4303a (diff) | |
| download | cogl-e9f721216e4f7974912b58480e8ca001c82a270a.tar.gz | |
Add _primitive_draw to replace _framebuffer_draw_primitive
When splitting out the CoglPath api we saw that we would be left with
inconsistent drawing apis if the drawing apis in core Cogl were lumped
into the cogl_framebuffer_ api considering other Cogl sub-libraries or
that others will want to create higher level drawing apis outside of
Cogl but can't use the same namespace.
So that we can aim for a more consistent style this adds a
cogl_primitive_draw() api, comparable to cogl_path_fill() or
cogl_pango_show_layout() that's intended to replace
cogl_framebuffer_draw_primitive()
Note: the attribute and rectangle drawing apis are still in the
cogl_framebuffer_ namespace and this might potentially change but in
these cases there is no single object representing the thing being drawn
so it seems a more reasonable they they live in the framebuffer
namespace for now.
Note: the cogl_framebuffer_draw_primitive() api isn't removed by this
patch so it can more conveniently be cherry picked to the 1.16 branch so
we can mark it deprecated for a short while. Even though it's marked as
experimental api we know that there are people using the api so we'd
like to give them a chance to switch to the new api.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 418912b93ff81a47f9b38114d05335ab76277c48)
Conflicts:
cogl-pango/cogl-pango-display-list.c
cogl/Makefile.am
cogl/cogl-framebuffer.c
cogl/cogl-pipeline-layer-state.h
cogl/cogl2-path.c
cogl/driver/gl/cogl-clip-stack-gl.c
Diffstat (limited to 'cogl/cogl.symbols')
| -rw-r--r-- | cogl/cogl.symbols | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols index c74f667e..100fa6d8 100644 --- a/cogl/cogl.symbols +++ b/cogl/cogl.symbols @@ -228,7 +228,6 @@ cogl_framebuffer_clear cogl_framebuffer_discard_buffers cogl_framebuffer_draw_attributes cogl_framebuffer_draw_indexed_attributes -cogl_framebuffer_draw_primitive cogl_framebuffer_draw_rectangle cogl_framebuffer_draw_rectangles cogl_framebuffer_draw_textured_rectangle @@ -684,6 +683,7 @@ cogl_primitive_set_first_vertex cogl_primitive_set_indices cogl_primitive_set_mode cogl_primitive_set_n_vertices +cogl_primitive_draw cogl_primitive_texture_set_auto_mipmap |