mirror of
https://github.com/brl/mutter.git
synced 2024-11-26 18:11:05 -05:00
7365c3aa77
This splits out the cogl_path_ api into a separate cogl-path sub-library
like cogl-pango and cogl-gst. This enables developers to build Cogl with
this sub-library disabled if they don't need it which can be useful when
its important to keep the size of an application and its dependencies
down to a minimum. The functions cogl_framebuffer_{fill,stroke}_path
have been renamed to cogl_path_{fill,stroke}.
There were a few places in core cogl and cogl-gst that referenced the
CoglPath api and these have been decoupled by using the CoglPrimitive
api instead. In the case of cogl_framebuffer_push_path_clip() the core
clip stack no longer accepts path clips directly but it's now possible
to get a CoglPrimitive for the fill of a path and so the implementation
of cogl_framebuffer_push_path_clip() now lives in cogl-path and works as
a shim that first gets a CoglPrimitive and uses
cogl_framebuffer_push_primitive_clip instead.
We may want to consider renaming cogl_framebuffer_push_path_clip to
put it in the cogl_path_ namespace.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit 8aadfd829239534fb4ec8255cdea813d698c5a3f)
So as to avoid breaking the 1.x API or even the ABI since we are quite
late in the 1.16 development cycle the patch was modified to build
cogl-path as a noinst_LTLIBRARY before building cogl and link the code
directly into libcogl.so as it was previously. This way we can wait
until the start of the 1.18 cycle before splitting the code into a
separate libcogl-path.so.
This also adds shims for cogl_framebuffer_fill/stroke_path() to avoid
breaking the 1.x API/ABI.
144 lines
4.0 KiB
C
144 lines
4.0 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2012 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
/* These functions are just here temporarily for the 1.10.x releases
|
|
to maintain ABI compatibility. They will be removed again
|
|
immediately once the branch for 1.12.x is created */
|
|
|
|
#include "cogl-framebuffer.h"
|
|
#include "cogl-framebuffer-private.h"
|
|
#include "cogl-index-buffer.h"
|
|
#include "cogl-pipeline.h"
|
|
|
|
/* These were never declared in a public header so we might as well
|
|
keep it that way. The declarations here are just to avoid a
|
|
warning */
|
|
GQuark
|
|
cogl_display_error_quark (void);
|
|
|
|
GQuark
|
|
cogl_onscreen_template_error_quark (void);
|
|
|
|
GQuark
|
|
cogl_swap_chain_error_quark (void);
|
|
|
|
GQuark
|
|
cogl_texture_3d_error_quark (void);
|
|
|
|
CoglBool
|
|
cogl_index_buffer_allocate (CoglIndexBuffer *indices,
|
|
CoglError *error);
|
|
|
|
CoglBool
|
|
cogl_is_journal (void *object);
|
|
|
|
void
|
|
cogl_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
|
|
CoglPipeline *pipeline,
|
|
CoglVerticesMode mode,
|
|
int first_vertex,
|
|
int n_vertices,
|
|
CoglIndices *indices,
|
|
...);
|
|
|
|
GQuark
|
|
cogl_display_error_quark (void)
|
|
{
|
|
return g_quark_from_static_string ("cogl-display-error-quark");
|
|
}
|
|
|
|
GQuark
|
|
cogl_onscreen_template_error_quark (void)
|
|
{
|
|
return g_quark_from_static_string ("cogl-onscreen-template-error-quark");
|
|
}
|
|
|
|
GQuark
|
|
cogl_swap_chain_error_quark (void)
|
|
{
|
|
return g_quark_from_static_string ("cogl-swap-chain-error-quark");
|
|
}
|
|
|
|
GQuark
|
|
cogl_texture_3d_error_quark (void)
|
|
{
|
|
return g_quark_from_static_string ("cogl-texture-3d-error-quark");
|
|
}
|
|
|
|
CoglBool
|
|
cogl_index_buffer_allocate (CoglIndexBuffer *indices,
|
|
CoglError *error)
|
|
{
|
|
return TRUE;
|
|
}
|
|
|
|
CoglBool
|
|
cogl_is_journal (void *object)
|
|
{
|
|
/* There's no way to get a pointer to a journal so this will never
|
|
return TRUE from an application's perspective */
|
|
return FALSE;
|
|
}
|
|
|
|
void
|
|
cogl_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
|
|
CoglPipeline *pipeline,
|
|
CoglVerticesMode mode,
|
|
int first_vertex,
|
|
int n_vertices,
|
|
CoglIndices *indices,
|
|
...)
|
|
{
|
|
va_list ap;
|
|
int n_attributes;
|
|
CoglAttribute **attributes;
|
|
int i;
|
|
CoglAttribute *attribute;
|
|
|
|
va_start (ap, indices);
|
|
for (n_attributes = 0; va_arg (ap, CoglAttribute *); n_attributes++)
|
|
;
|
|
va_end (ap);
|
|
|
|
attributes = g_alloca (sizeof (CoglAttribute *) * n_attributes);
|
|
|
|
va_start (ap, indices);
|
|
for (i = 0; (attribute = va_arg (ap, CoglAttribute *)); i++)
|
|
attributes[i] = attribute;
|
|
va_end (ap);
|
|
|
|
_cogl_framebuffer_draw_indexed_attributes (framebuffer,
|
|
pipeline,
|
|
mode,
|
|
first_vertex,
|
|
n_vertices,
|
|
indices,
|
|
attributes,
|
|
n_attributes,
|
|
COGL_DRAW_SKIP_LEGACY_STATE);
|
|
}
|