2008-04-30 11:05:17 -04:00
|
|
|
/*
|
2009-04-27 10:48:12 -04:00
|
|
|
* Cogl
|
2008-04-30 11:05:17 -04:00
|
|
|
*
|
2009-04-27 10:48:12 -04:00
|
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
2008-04-30 11:05:17 -04:00
|
|
|
*
|
2009-04-27 10:48:12 -04:00
|
|
|
* Copyright (C) 2007,2008,2009 Intel Corporation.
|
2008-04-30 11:05:17 -04:00
|
|
|
*
|
|
|
|
* 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, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "cogl.h"
|
|
|
|
#include "cogl-internal.h"
|
|
|
|
#include "cogl-context.h"
|
2009-09-16 09:01:57 -04:00
|
|
|
#include "cogl-journal-private.h"
|
2009-03-23 08:29:15 -04:00
|
|
|
#include "cogl-texture-private.h"
|
2009-05-23 12:42:10 -04:00
|
|
|
#include "cogl-material-private.h"
|
2009-06-01 12:10:22 -04:00
|
|
|
#include "cogl-vertex-buffer-private.h"
|
2009-09-25 09:34:34 -04:00
|
|
|
#include "cogl-draw-buffer-private.h"
|
2008-04-30 11:05:17 -04:00
|
|
|
|
|
|
|
#include <string.h>
|
2009-01-20 11:20:54 -05:00
|
|
|
#include <math.h>
|
2008-04-30 11:05:17 -04:00
|
|
|
|
|
|
|
#define _COGL_MAX_BEZ_RECURSE_DEPTH 16
|
|
|
|
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
typedef struct _TextureSlicedQuadState
|
|
|
|
{
|
|
|
|
CoglHandle material;
|
|
|
|
float tex_virtual_origin_x;
|
|
|
|
float tex_virtual_origin_y;
|
|
|
|
float quad_origin_x;
|
|
|
|
float quad_origin_y;
|
|
|
|
float v_to_q_scale_x;
|
|
|
|
float v_to_q_scale_y;
|
|
|
|
float quad_len_x;
|
|
|
|
float quad_len_y;
|
|
|
|
gboolean flipped_x;
|
|
|
|
gboolean flipped_y;
|
|
|
|
} TextureSlicedQuadState;
|
|
|
|
|
|
|
|
typedef struct _TextureSlicedPolygonState
|
|
|
|
{
|
|
|
|
CoglTextureVertex *vertices;
|
|
|
|
int n_vertices;
|
|
|
|
int stride;
|
|
|
|
} TextureSlicedPolygonState;
|
|
|
|
|
2009-03-23 08:29:15 -04:00
|
|
|
/* these are defined in the particular backend */
|
2008-12-04 08:45:09 -05:00
|
|
|
void _cogl_path_add_node (gboolean new_sub_path,
|
2009-01-20 11:20:54 -05:00
|
|
|
float x,
|
|
|
|
float y);
|
2008-05-05 08:01:19 -04:00
|
|
|
void _cogl_path_fill_nodes ();
|
|
|
|
void _cogl_path_stroke_nodes ();
|
Fully integrates CoglMaterial throughout the rest of Cogl
This glues CoglMaterial in as the fundamental way that Cogl describes how to
fill in geometry.
It adds cogl_set_source (), which is used to set the material which will be
used by all subsequent drawing functions
It adds cogl_set_source_texture as a convenience for setting up a default
material with a single texture layer, and cogl_set_source_color is now also
a convenience for setting up a material with a solid fill.
"drawing functions" include, cogl_rectangle, cogl_texture_rectangle,
cogl_texture_multiple_rectangles, cogl_texture_polygon (though the
cogl_texture_* funcs have been renamed; see below for details),
cogl_path_fill/stroke and cogl_vertex_buffer_draw*.
cogl_texture_rectangle, cogl_texture_multiple_rectangles and
cogl_texture_polygon no longer take a texture handle; instead the current
source material is referenced. The functions have also been renamed to:
cogl_rectangle_with_texture_coords, cogl_rectangles_with_texture_coords
and cogl_polygon respectivly.
Most code that previously did:
cogl_texture_rectangle (tex_handle, x, y,...);
needs to be changed to now do:
cogl_set_source_texture (tex_handle);
cogl_rectangle_with_texture_coords (x, y,....);
In the less likely case where you were blending your source texture with a color
like:
cogl_set_source_color4ub (r,g,b,a); /* where r,g,b,a isn't just white */
cogl_texture_rectangle (tex_handle, x, y,...);
you will need your own material to do that:
mat = cogl_material_new ();
cogl_material_set_color4ub (r,g,b,a);
cogl_material_set_layer (mat, 0, tex_handle));
cogl_set_source_material (mat);
Code that uses the texture coordinates, 0, 0, 1, 1 don't need to use
cog_rectangle_with_texure_coords since these are the coordinates that
cogl_rectangle will use.
For cogl_texture_polygon; as well as dropping the texture handle, the
n_vertices and vertices arguments were transposed for consistency. So
code previously written as:
cogl_texture_polygon (tex_handle, 3, verts, TRUE);
need to be written as:
cogl_set_source_texture (tex_handle);
cogl_polygon (verts, 3, TRUE);
All of the unit tests have been updated to now use the material API and
test-cogl-material has been renamed to test-cogl-multitexture since any
textured quad is now technically a test of CoglMaterial but this test
specifically creates a material with multiple texture layers.
Note: The GLES backend has not been updated yet; that will be done in a
following commit.
2009-01-23 11:15:40 -05:00
|
|
|
|
2009-03-23 08:29:15 -04:00
|
|
|
static void
|
2009-09-16 06:56:17 -04:00
|
|
|
log_quad_sub_textures_cb (CoglHandle texture_handle,
|
|
|
|
GLuint gl_handle,
|
|
|
|
GLenum gl_target,
|
|
|
|
float *subtexture_coords,
|
|
|
|
float *virtual_coords,
|
|
|
|
void *user_data)
|
2009-03-23 08:29:15 -04:00
|
|
|
{
|
2009-09-16 06:56:17 -04:00
|
|
|
TextureSlicedQuadState *state = user_data;
|
|
|
|
float quad_coords[4];
|
|
|
|
|
|
|
|
#define TEX_VIRTUAL_TO_QUAD(V, Q, AXIS) \
|
|
|
|
do { \
|
|
|
|
Q = V - state->tex_virtual_origin_##AXIS; \
|
|
|
|
Q *= state->v_to_q_scale_##AXIS; \
|
|
|
|
if (state->flipped_##AXIS) \
|
|
|
|
Q = state->quad_len_##AXIS - Q; \
|
|
|
|
Q += state->quad_origin_##AXIS; \
|
|
|
|
} while (0);
|
|
|
|
|
|
|
|
TEX_VIRTUAL_TO_QUAD (virtual_coords[0], quad_coords[0], x);
|
|
|
|
TEX_VIRTUAL_TO_QUAD (virtual_coords[1], quad_coords[1], y);
|
|
|
|
|
|
|
|
TEX_VIRTUAL_TO_QUAD (virtual_coords[2], quad_coords[2], x);
|
|
|
|
TEX_VIRTUAL_TO_QUAD (virtual_coords[3], quad_coords[3], y);
|
|
|
|
|
|
|
|
#undef TEX_VIRTUAL_TO_QUAD
|
|
|
|
|
|
|
|
COGL_NOTE (DRAW,
|
|
|
|
"~~~~~ slice\n"
|
|
|
|
"qx1: %f\t"
|
|
|
|
"qy1: %f\n"
|
|
|
|
"qx2: %f\t"
|
|
|
|
"qy2: %f\n"
|
|
|
|
"tx1: %f\t"
|
|
|
|
"ty1: %f\n"
|
|
|
|
"tx2: %f\t"
|
|
|
|
"ty2: %f\n",
|
|
|
|
quad_coords[0], quad_coords[1],
|
|
|
|
quad_coords[2], quad_coords[3],
|
|
|
|
subtexture_coords[0], subtexture_coords[1],
|
|
|
|
subtexture_coords[2], subtexture_coords[3]);
|
|
|
|
|
|
|
|
/* FIXME: when the wrap mode becomes part of the material we need to
|
|
|
|
* be able to override the wrap mode when logging a quad. */
|
|
|
|
_cogl_journal_log_quad (quad_coords[0],
|
|
|
|
quad_coords[1],
|
|
|
|
quad_coords[2],
|
|
|
|
quad_coords[3],
|
|
|
|
state->material,
|
|
|
|
1, /* one layer */
|
|
|
|
0, /* don't need to use fallbacks */
|
|
|
|
gl_handle, /* replace the layer0 texture */
|
|
|
|
subtexture_coords,
|
|
|
|
4);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This path doesn't currently support multitexturing but is used for
|
|
|
|
* CoglTextures that don't support repeating using the GPU so we need to
|
|
|
|
* manually emit extra geometry to fake the repeating. This includes:
|
|
|
|
*
|
|
|
|
* - CoglTexture2DSliced: when made of > 1 slice or if the users given
|
|
|
|
* texture coordinates require repeating,
|
|
|
|
* - CoglTexture2DAtlas: if the users given texture coordinates require
|
|
|
|
* repeating,
|
|
|
|
* - CoglTextureRectangle: if the users given texture coordinates require
|
|
|
|
* repeating,
|
|
|
|
* - CoglTexturePixmap: if the users given texture coordinates require
|
|
|
|
* repeating
|
|
|
|
*/
|
|
|
|
/* TODO: support multitexturing */
|
|
|
|
static void
|
|
|
|
_cogl_texture_quad_multiple_primitives (CoglHandle tex_handle,
|
|
|
|
CoglHandle material,
|
|
|
|
float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2,
|
|
|
|
float tx_1,
|
|
|
|
float ty_1,
|
|
|
|
float tx_2,
|
|
|
|
float ty_2)
|
|
|
|
{
|
|
|
|
TextureSlicedQuadState state;
|
|
|
|
gboolean tex_virtual_flipped_x;
|
|
|
|
gboolean tex_virtual_flipped_y;
|
|
|
|
gboolean quad_flipped_x;
|
|
|
|
gboolean quad_flipped_y;
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
COGL_NOTE (DRAW, "Drawing Tex Quad (Multi-Prim Mode)");
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
/* We can't use hardware repeat so we need to set clamp to edge
|
|
|
|
otherwise it might pull in edge pixels from the other side */
|
2009-09-16 06:56:17 -04:00
|
|
|
/* FIXME: wrap modes should be part of the material! */
|
|
|
|
_cogl_texture_set_wrap_mode_parameter (tex_handle, GL_CLAMP_TO_EDGE);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
state.material = material;
|
2009-03-23 08:29:15 -04:00
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
/* Get together the data we need to transform the virtual texture
|
|
|
|
* coordinates of each slice into quad coordinates...
|
|
|
|
*
|
|
|
|
* NB: We need to consider that the quad coordinates and the texture
|
|
|
|
* coordinates may be inverted along the x or y axis, and must preserve the
|
|
|
|
* inversions when we emit the final geometry.
|
|
|
|
*/
|
2009-03-23 08:29:15 -04:00
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
tex_virtual_flipped_x = (tx_1 > tx_2) ? TRUE : FALSE;
|
|
|
|
tex_virtual_flipped_y = (ty_1 > ty_2) ? TRUE : FALSE;
|
|
|
|
state.tex_virtual_origin_x = tex_virtual_flipped_x ? tx_2 : tx_1;
|
|
|
|
state.tex_virtual_origin_y = tex_virtual_flipped_y ? ty_2 : ty_1;
|
|
|
|
|
|
|
|
quad_flipped_x = (x_1 > x_2) ? TRUE : FALSE;
|
|
|
|
quad_flipped_y = (y_1 > y_2) ? TRUE : FALSE;
|
|
|
|
state.quad_origin_x = quad_flipped_x ? x_2 : x_1;
|
|
|
|
state.quad_origin_y = quad_flipped_y ? y_2 : y_1;
|
|
|
|
|
|
|
|
/* flatten the two forms of coordinate inversion into one... */
|
|
|
|
state.flipped_x = tex_virtual_flipped_x ^ quad_flipped_x;
|
|
|
|
state.flipped_y = tex_virtual_flipped_y ^ quad_flipped_y;
|
|
|
|
|
|
|
|
/* We use the _len_AXIS naming here instead of _width and _height because
|
|
|
|
* log_quad_slice_cb uses a macro with symbol concatenation to handle both
|
|
|
|
* axis, so this is more convenient... */
|
|
|
|
state.quad_len_x = fabs (x_2 - x_1);
|
|
|
|
state.quad_len_y = fabs (y_2 - y_1);
|
|
|
|
|
|
|
|
state.v_to_q_scale_x = fabs (state.quad_len_x / (tx_2 - tx_1));
|
|
|
|
state.v_to_q_scale_y = fabs (state.quad_len_y / (ty_2 - ty_1));
|
|
|
|
|
|
|
|
_cogl_texture_foreach_sub_texture_in_region (tex_handle,
|
|
|
|
tx_1, ty_1, tx_2, ty_2,
|
|
|
|
log_quad_sub_textures_cb,
|
|
|
|
&state);
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
/* This path supports multitexturing but only when each of the layers is
|
|
|
|
* handled with a single GL texture. Also if repeating is necessary then
|
|
|
|
* _cogl_texture_can_hardware_repeat() must return TRUE.
|
|
|
|
* This includes layers made from:
|
|
|
|
*
|
|
|
|
* - CoglTexture2DSliced: if only comprised of a single slice with optional
|
|
|
|
* waste, assuming the users given texture coordinates don't require
|
|
|
|
* repeating.
|
|
|
|
* - CoglTexture{1D,2D,3D}: always.
|
|
|
|
* - CoglTexture2DAtlas: assuming the users given texture coordinates don't
|
|
|
|
* require repeating.
|
|
|
|
* - CoglTextureRectangle: assuming the users given texture coordinates don't
|
|
|
|
* require repeating.
|
|
|
|
* - CoglTexturePixmap: assuming the users given texture coordinates don't
|
|
|
|
* require repeating.
|
|
|
|
*/
|
2009-03-23 08:29:15 -04:00
|
|
|
static gboolean
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_multitexture_quad_single_primitive (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2,
|
|
|
|
CoglHandle material,
|
|
|
|
guint32 fallback_layers,
|
|
|
|
const float *user_tex_coords,
|
|
|
|
int user_tex_coords_len)
|
2009-03-23 08:29:15 -04:00
|
|
|
{
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
int n_layers = cogl_material_get_n_layers (material);
|
|
|
|
float *final_tex_coords = alloca (sizeof (float) * 4 * n_layers);
|
2009-03-23 08:29:15 -04:00
|
|
|
const GList *layers;
|
|
|
|
GList *tmp;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, FALSE);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Validate the texture coordinates for this rectangle.
|
|
|
|
*/
|
|
|
|
layers = cogl_material_get_layers (material);
|
|
|
|
for (tmp = (GList *)layers, i = 0; tmp != NULL; tmp = tmp->next, i++)
|
|
|
|
{
|
|
|
|
CoglHandle layer = (CoglHandle)tmp->data;
|
|
|
|
CoglHandle tex_handle;
|
|
|
|
const float *in_tex_coords;
|
|
|
|
float *out_tex_coords;
|
2009-09-16 06:56:17 -04:00
|
|
|
float default_tex_coords[4] = {0.0, 0.0, 1.0, 1.0};
|
2009-03-23 08:29:15 -04:00
|
|
|
|
2009-06-19 07:15:12 -04:00
|
|
|
tex_handle = cogl_material_layer_get_texture (layer);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
2009-06-19 07:15:12 -04:00
|
|
|
/* COGL_INVALID_HANDLE textures are handled by
|
|
|
|
* _cogl_material_flush_gl_state */
|
|
|
|
if (tex_handle == COGL_INVALID_HANDLE)
|
|
|
|
continue;
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
in_tex_coords = &user_tex_coords[i * 4];
|
|
|
|
out_tex_coords = &final_tex_coords[i * 4];
|
|
|
|
|
|
|
|
|
|
|
|
/* If the texture has waste or we are using GL_TEXTURE_RECT we
|
|
|
|
* can't handle texture repeating so we check that the texture
|
|
|
|
* coords lie in the range [0,1].
|
|
|
|
*
|
2009-09-16 06:56:17 -04:00
|
|
|
* NB: We already know that the texture isn't sliced so we can assume
|
|
|
|
* that the default coords (0,0) and (1,1) would only reference a single
|
|
|
|
* GL texture.
|
|
|
|
*
|
|
|
|
* NB: We already know that no texture matrix is being used if the
|
|
|
|
* texture doesn't support hardware repeat.
|
2009-03-23 08:29:15 -04:00
|
|
|
*/
|
2009-09-16 06:56:17 -04:00
|
|
|
if (!_cogl_texture_can_hardware_repeat (tex_handle)
|
|
|
|
&& i < user_tex_coords_len / 4
|
|
|
|
&& (in_tex_coords[0] < 0 || in_tex_coords[0] > 1.0
|
|
|
|
|| in_tex_coords[1] < 0 || in_tex_coords[1] > 1.0
|
|
|
|
|| in_tex_coords[2] < 0 || in_tex_coords[2] > 1.0
|
|
|
|
|| in_tex_coords[3] < 0 || in_tex_coords[3] > 1.0))
|
2009-03-23 08:29:15 -04:00
|
|
|
{
|
|
|
|
if (i == 0)
|
|
|
|
{
|
|
|
|
if (n_layers > 1)
|
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
|
|
|
g_warning ("Skipping layers 1..n of your material since "
|
2009-09-16 06:56:17 -04:00
|
|
|
"the first layer doesn't support hardware "
|
|
|
|
"repeat (e.g. because of waste or use of "
|
|
|
|
"GL_TEXTURE_RECTANGLE_ARB) and you supplied "
|
|
|
|
"texture coordinates outside the range [0,1]."
|
|
|
|
"Falling back to software repeat assuming "
|
2009-03-23 08:29:15 -04:00
|
|
|
"layer 0 is the most important one keep");
|
|
|
|
warning_seen = TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
|
|
|
g_warning ("Skipping layer %d of your material "
|
2009-09-16 06:56:17 -04:00
|
|
|
"since you have supplied texture coords "
|
|
|
|
"outside the range [0,1] but the texture "
|
|
|
|
"doesn't support hardware repeat (e.g. "
|
|
|
|
"because of waste or use of "
|
|
|
|
"GL_TEXTURE_RECTANGLE_ARB). This isn't "
|
|
|
|
"supported with multi-texturing.", i);
|
2009-03-23 08:29:15 -04:00
|
|
|
warning_seen = TRUE;
|
|
|
|
|
|
|
|
/* NB: marking for fallback will replace the layer with
|
|
|
|
* a default transparent texture */
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
fallback_layers |= (1 << i);
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Setup the texture unit...
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* NB: The user might not have supplied texture coordinates for all
|
|
|
|
* layers... */
|
|
|
|
if (i < (user_tex_coords_len / 4))
|
|
|
|
{
|
|
|
|
GLenum wrap_mode;
|
|
|
|
|
|
|
|
/* If the texture coords are all in the range [0,1] then we want to
|
|
|
|
clamp the coords to the edge otherwise it can pull in edge pixels
|
|
|
|
from the wrong side when scaled */
|
|
|
|
if (in_tex_coords[0] >= 0 && in_tex_coords[0] <= 1.0
|
|
|
|
&& in_tex_coords[1] >= 0 && in_tex_coords[1] <= 1.0
|
|
|
|
&& in_tex_coords[2] >= 0 && in_tex_coords[2] <= 1.0
|
|
|
|
&& in_tex_coords[3] >= 0 && in_tex_coords[3] <= 1.0)
|
|
|
|
wrap_mode = GL_CLAMP_TO_EDGE;
|
|
|
|
else
|
|
|
|
wrap_mode = GL_REPEAT;
|
|
|
|
|
|
|
|
memcpy (out_tex_coords, in_tex_coords, sizeof (GLfloat) * 4);
|
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_texture_set_wrap_mode_parameter (tex_handle, wrap_mode);
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2009-09-16 06:56:17 -04:00
|
|
|
memcpy (out_tex_coords, default_tex_coords, sizeof (GLfloat) * 4);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_texture_set_wrap_mode_parameter (tex_handle, GL_CLAMP_TO_EDGE);
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_texture_transform_coords_to_gl (tex_handle,
|
|
|
|
&out_tex_coords[0],
|
|
|
|
&out_tex_coords[1]);
|
|
|
|
_cogl_texture_transform_coords_to_gl (tex_handle,
|
|
|
|
&out_tex_coords[2],
|
|
|
|
&out_tex_coords[3]);
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
_cogl_journal_log_quad (x_1,
|
|
|
|
y_1,
|
|
|
|
x_2,
|
|
|
|
y_2,
|
|
|
|
material,
|
|
|
|
n_layers,
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
fallback_layers,
|
2009-03-23 08:29:15 -04:00
|
|
|
0, /* don't replace the layer0 texture */
|
|
|
|
final_tex_coords,
|
|
|
|
n_layers * 4);
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct _CoglMutiTexturedRect
|
|
|
|
{
|
|
|
|
float x_1;
|
|
|
|
float y_1;
|
|
|
|
float x_2;
|
|
|
|
float y_2;
|
|
|
|
const float *tex_coords;
|
|
|
|
gint tex_coords_len;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_rectangles_with_multitexture_coords (
|
|
|
|
struct _CoglMutiTexturedRect *rects,
|
|
|
|
gint n_rects)
|
|
|
|
{
|
|
|
|
CoglHandle material;
|
|
|
|
const GList *layers;
|
|
|
|
int n_layers;
|
|
|
|
const GList *tmp;
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
guint32 fallback_layers = 0;
|
2009-03-23 08:29:15 -04:00
|
|
|
gboolean all_use_sliced_quad_fallback = FALSE;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
material = ctx->source_material;
|
|
|
|
|
|
|
|
layers = cogl_material_get_layers (material);
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
n_layers = cogl_material_get_n_layers (material);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Validate all the layers of the current source material...
|
|
|
|
*/
|
|
|
|
|
|
|
|
for (tmp = layers, i = 0; tmp != NULL; tmp = tmp->next, i++)
|
|
|
|
{
|
|
|
|
CoglHandle layer = tmp->data;
|
2009-06-19 07:15:12 -04:00
|
|
|
CoglHandle tex_handle;
|
2009-03-23 08:29:15 -04:00
|
|
|
gulong flags;
|
|
|
|
|
|
|
|
if (cogl_material_layer_get_type (layer)
|
|
|
|
!= COGL_MATERIAL_LAYER_TYPE_TEXTURE)
|
|
|
|
continue;
|
|
|
|
|
2009-06-19 07:15:12 -04:00
|
|
|
tex_handle = cogl_material_layer_get_texture (layer);
|
|
|
|
|
|
|
|
/* COGL_INVALID_HANDLE textures are handled by
|
|
|
|
* _cogl_material_flush_gl_state */
|
|
|
|
if (tex_handle == COGL_INVALID_HANDLE)
|
|
|
|
continue;
|
|
|
|
|
2009-03-23 08:29:15 -04:00
|
|
|
/* XXX:
|
|
|
|
* For now, if the first layer is sliced then all other layers are
|
|
|
|
* ignored since we currently don't support multi-texturing with
|
|
|
|
* sliced textures. If the first layer is not sliced then any other
|
|
|
|
* layers found to be sliced will be skipped. (with a warning)
|
|
|
|
*
|
|
|
|
* TODO: Add support for multi-texturing rectangles with sliced
|
|
|
|
* textures if no texture matrices are in use.
|
|
|
|
*/
|
|
|
|
if (cogl_texture_is_sliced (tex_handle))
|
|
|
|
{
|
|
|
|
if (i == 0)
|
|
|
|
{
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
fallback_layers = ~1; /* fallback all except the first layer */
|
2009-03-23 08:29:15 -04:00
|
|
|
all_use_sliced_quad_fallback = TRUE;
|
|
|
|
if (tmp->next)
|
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
|
|
|
g_warning ("Skipping layers 1..n of your material since "
|
|
|
|
"the first layer is sliced. We don't currently "
|
|
|
|
"support any multi-texturing with sliced "
|
|
|
|
"textures but assume layer 0 is the most "
|
|
|
|
"important to keep");
|
|
|
|
warning_seen = TRUE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
|
|
|
g_warning ("Skipping layer %d of your material consisting of "
|
|
|
|
"a sliced texture (unsuported for multi texturing)",
|
|
|
|
i);
|
|
|
|
warning_seen = TRUE;
|
|
|
|
|
|
|
|
/* NB: marking for fallback will replace the layer with
|
|
|
|
* a default transparent texture */
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
fallback_layers |= (1 << i);
|
2009-03-23 08:29:15 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
/* If the texture can't be repeated with the GPU (e.g. because it has
|
|
|
|
* waste or if using GL_TEXTURE_RECTANGLE_ARB) then we don't support
|
|
|
|
* multi texturing since we don't know if the result will end up trying
|
|
|
|
* to texture from the waste area. */
|
2009-05-23 12:42:10 -04:00
|
|
|
flags = _cogl_material_layer_get_flags (layer);
|
2009-03-23 08:29:15 -04:00
|
|
|
if (flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX
|
2009-09-16 06:56:17 -04:00
|
|
|
&& !_cogl_texture_can_hardware_repeat (tex_handle))
|
2009-03-23 08:29:15 -04:00
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
2009-09-16 06:56:17 -04:00
|
|
|
g_warning ("Skipping layer %d of your material since a custom "
|
|
|
|
"texture matrix was given for a texture that can't be "
|
|
|
|
"repeated using the GPU and the result may try to "
|
|
|
|
"sample beyond the bounds of the texture ",
|
|
|
|
i);
|
2009-03-23 08:29:15 -04:00
|
|
|
warning_seen = TRUE;
|
|
|
|
|
|
|
|
/* NB: marking for fallback will replace the layer with
|
|
|
|
* a default transparent texture */
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
fallback_layers |= (1 << i);
|
2009-03-23 08:29:15 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Emit geometry for each of the rectangles...
|
|
|
|
*/
|
|
|
|
|
|
|
|
for (i = 0; i < n_rects; i++)
|
|
|
|
{
|
2009-09-16 06:56:17 -04:00
|
|
|
CoglHandle first_layer, tex_handle;
|
|
|
|
const float default_tex_coords[4] = {0.0, 0.0, 1.0, 1.0};
|
|
|
|
const float *tex_coords;
|
|
|
|
|
|
|
|
if (!all_use_sliced_quad_fallback)
|
2009-03-23 08:29:15 -04:00
|
|
|
{
|
2009-09-16 06:56:17 -04:00
|
|
|
gboolean success =
|
|
|
|
_cogl_multitexture_quad_single_primitive (rects[i].x_1,
|
|
|
|
rects[i].y_1,
|
|
|
|
rects[i].x_2,
|
|
|
|
rects[i].y_2,
|
|
|
|
material,
|
|
|
|
fallback_layers,
|
|
|
|
rects[i].tex_coords,
|
|
|
|
rects[i].tex_coords_len);
|
|
|
|
|
|
|
|
/* NB: If _cogl_multitexture_quad_single_primitive fails then it
|
|
|
|
* means the user tried to use texture repeat with a texture that
|
|
|
|
* can't be repeated by the GPU (e.g. due to waste or use of
|
|
|
|
* GL_TEXTURE_RECTANGLE_ARB) */
|
|
|
|
if (success)
|
|
|
|
continue;
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
2009-09-16 06:56:17 -04:00
|
|
|
|
|
|
|
/* If multitexturing failed or we are drawing with a sliced texture
|
|
|
|
* then we only support a single layer so we pluck out the texture
|
|
|
|
* from the first material layer... */
|
|
|
|
first_layer = layers->data;
|
|
|
|
tex_handle = cogl_material_layer_get_texture (first_layer);
|
|
|
|
|
|
|
|
if (rects[i].tex_coords)
|
|
|
|
tex_coords = rects[i].tex_coords;
|
|
|
|
else
|
|
|
|
tex_coords = default_tex_coords;
|
|
|
|
|
|
|
|
_cogl_texture_quad_multiple_primitives (tex_handle,
|
|
|
|
material,
|
|
|
|
rects[i].x_1, rects[i].y_1,
|
|
|
|
rects[i].x_2, rects[i].y_2,
|
|
|
|
tex_coords[0],
|
|
|
|
tex_coords[1],
|
|
|
|
tex_coords[2],
|
|
|
|
tex_coords[3]);
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
#if 0
|
|
|
|
/* XXX: The current journal doesn't handle changes to the model view matrix
|
|
|
|
* so for now we force a flush at the end of every primitive. */
|
2009-03-23 08:29:15 -04:00
|
|
|
_cogl_journal_flush ();
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
#endif
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_rectangles (const float *verts,
|
|
|
|
guint n_rects)
|
|
|
|
{
|
2009-06-16 16:29:21 -04:00
|
|
|
struct _CoglMutiTexturedRect *rects;
|
2009-03-23 08:29:15 -04:00
|
|
|
int i;
|
|
|
|
|
2009-06-16 16:29:21 -04:00
|
|
|
rects = g_alloca (n_rects * sizeof (struct _CoglMutiTexturedRect));
|
|
|
|
|
2009-03-23 08:29:15 -04:00
|
|
|
for (i = 0; i < n_rects; i++)
|
|
|
|
{
|
|
|
|
rects[i].x_1 = verts[i * 4];
|
|
|
|
rects[i].y_1 = verts[i * 4 + 1];
|
|
|
|
rects[i].x_2 = verts[i * 4 + 2];
|
|
|
|
rects[i].y_2 = verts[i * 4 + 3];
|
|
|
|
rects[i].tex_coords = NULL;
|
|
|
|
rects[i].tex_coords_len = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
_cogl_rectangles_with_multitexture_coords (rects, n_rects);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_rectangles_with_texture_coords (const float *verts,
|
|
|
|
guint n_rects)
|
|
|
|
{
|
2009-06-16 16:29:21 -04:00
|
|
|
struct _CoglMutiTexturedRect *rects;
|
2009-03-23 08:29:15 -04:00
|
|
|
int i;
|
|
|
|
|
2009-06-16 16:29:21 -04:00
|
|
|
rects = g_alloca (n_rects * sizeof (struct _CoglMutiTexturedRect));
|
|
|
|
|
2009-03-23 08:29:15 -04:00
|
|
|
for (i = 0; i < n_rects; i++)
|
|
|
|
{
|
|
|
|
rects[i].x_1 = verts[i * 8];
|
|
|
|
rects[i].y_1 = verts[i * 8 + 1];
|
|
|
|
rects[i].x_2 = verts[i * 8 + 2];
|
|
|
|
rects[i].y_2 = verts[i * 8 + 3];
|
|
|
|
/* FIXME: rect should be defined to have a const float *geom;
|
|
|
|
* instead, to avoid this copy
|
|
|
|
* rect[i].geom = &verts[n_rects * 8]; */
|
|
|
|
rects[i].tex_coords = &verts[i * 8 + 4];
|
|
|
|
rects[i].tex_coords_len = 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
_cogl_rectangles_with_multitexture_coords (rects, n_rects);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_rectangle_with_texture_coords (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2,
|
|
|
|
float tx_1,
|
|
|
|
float ty_1,
|
|
|
|
float tx_2,
|
|
|
|
float ty_2)
|
|
|
|
{
|
|
|
|
float verts[8];
|
|
|
|
|
|
|
|
verts[0] = x_1;
|
|
|
|
verts[1] = y_1;
|
|
|
|
verts[2] = x_2;
|
|
|
|
verts[3] = y_2;
|
|
|
|
verts[4] = tx_1;
|
|
|
|
verts[5] = ty_1;
|
|
|
|
verts[6] = tx_2;
|
|
|
|
verts[7] = ty_2;
|
|
|
|
|
|
|
|
cogl_rectangles_with_texture_coords (verts, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_rectangle_with_multitexture_coords (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2,
|
|
|
|
const float *user_tex_coords,
|
|
|
|
gint user_tex_coords_len)
|
|
|
|
{
|
|
|
|
struct _CoglMutiTexturedRect rect;
|
|
|
|
|
|
|
|
rect.x_1 = x_1;
|
|
|
|
rect.y_1 = y_1;
|
|
|
|
rect.x_2 = x_2;
|
|
|
|
rect.y_2 = y_2;
|
|
|
|
rect.tex_coords = user_tex_coords;
|
|
|
|
rect.tex_coords_len = user_tex_coords_len;
|
|
|
|
|
|
|
|
_cogl_rectangles_with_multitexture_coords (&rect, 1);
|
|
|
|
}
|
|
|
|
|
2008-05-05 08:01:19 -04:00
|
|
|
void
|
2009-01-29 08:31:11 -05:00
|
|
|
cogl_rectangle (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2)
|
2008-05-05 08:01:19 -04:00
|
|
|
{
|
2009-01-29 08:31:11 -05:00
|
|
|
cogl_rectangle_with_multitexture_coords (x_1, y_1,
|
|
|
|
x_2, y_2,
|
|
|
|
NULL, 0);
|
2008-05-05 08:01:19 -04:00
|
|
|
}
|
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
void
|
|
|
|
draw_polygon_sub_texture_cb (CoglHandle tex_handle,
|
|
|
|
GLuint gl_handle,
|
|
|
|
GLenum gl_target,
|
|
|
|
float *subtexture_coords,
|
|
|
|
float *virtual_coords,
|
|
|
|
void *user_data)
|
2009-03-23 08:29:15 -04:00
|
|
|
{
|
2009-09-16 06:56:17 -04:00
|
|
|
TextureSlicedPolygonState *state = user_data;
|
|
|
|
GLfloat *v;
|
|
|
|
int i;
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
CoglMaterialFlushOptions options;
|
2009-09-16 06:56:17 -04:00
|
|
|
float slice_origin_x;
|
|
|
|
float slice_origin_y;
|
|
|
|
float virtual_origin_x;
|
|
|
|
float virtual_origin_y;
|
|
|
|
float v_to_s_scale_x;
|
|
|
|
float v_to_s_scale_y;
|
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
slice_origin_x = subtexture_coords[0];
|
|
|
|
slice_origin_y = subtexture_coords[1];
|
|
|
|
virtual_origin_x = virtual_coords[0];
|
|
|
|
virtual_origin_y = virtual_coords[1];
|
|
|
|
v_to_s_scale_x = ((virtual_coords[2] - virtual_coords[0]) /
|
|
|
|
(subtexture_coords[2] - subtexture_coords[0]));
|
|
|
|
v_to_s_scale_y = ((virtual_coords[3] - virtual_coords[1]) /
|
|
|
|
(subtexture_coords[3] - subtexture_coords[1]));
|
|
|
|
|
|
|
|
/* Convert the vertices into an array of GLfloats ready to pass to
|
|
|
|
* OpenGL */
|
|
|
|
v = (GLfloat *)ctx->logged_vertices->data;
|
|
|
|
for (i = 0; i < state->n_vertices; i++)
|
|
|
|
{
|
|
|
|
/* NB: layout = [X,Y,Z,TX,TY,R,G,B,A,...] */
|
|
|
|
GLfloat *t = v + 3;
|
|
|
|
|
|
|
|
t[0] = ((state->vertices[i].tx - virtual_origin_x) * v_to_s_scale_x
|
|
|
|
+ slice_origin_x);
|
|
|
|
t[1] = ((state->vertices[i].ty - virtual_origin_y) * v_to_s_scale_y
|
|
|
|
+ slice_origin_y);
|
|
|
|
|
|
|
|
v += state->stride;
|
|
|
|
}
|
|
|
|
|
|
|
|
options.flags =
|
|
|
|
COGL_MATERIAL_FLUSH_DISABLE_MASK |
|
|
|
|
COGL_MATERIAL_FLUSH_LAYER0_OVERRIDE;
|
|
|
|
/* disable all except the first layer */
|
|
|
|
options.disable_layers = (guint32)~1;
|
|
|
|
options.layer0_override_texture = gl_handle;
|
|
|
|
|
|
|
|
_cogl_material_flush_gl_state (ctx->source_material, &options);
|
|
|
|
|
|
|
|
GE (glDrawArrays (GL_TRIANGLE_FAN, 0, state->n_vertices));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* handles 2d-sliced textures with > 1 slice */
|
|
|
|
static void
|
|
|
|
_cogl_texture_polygon_multiple_primitives (CoglTextureVertex *vertices,
|
|
|
|
unsigned int n_vertices,
|
|
|
|
unsigned int stride,
|
|
|
|
gboolean use_color)
|
|
|
|
{
|
|
|
|
const GList *layers;
|
|
|
|
CoglHandle layer0;
|
|
|
|
CoglHandle tex_handle;
|
|
|
|
GLfloat *v;
|
|
|
|
int i;
|
|
|
|
TextureSlicedPolygonState state;
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
/* We can assume in this case that we have at least one layer in the
|
|
|
|
* material that corresponds to a sliced cogl texture */
|
|
|
|
layers = cogl_material_get_layers (ctx->source_material);
|
|
|
|
layer0 = (CoglHandle)layers->data;
|
|
|
|
tex_handle = cogl_material_layer_get_texture (layer0);
|
|
|
|
|
|
|
|
v = (GLfloat *)ctx->logged_vertices->data;
|
|
|
|
for (i = 0; i < n_vertices; i++)
|
|
|
|
{
|
2009-06-16 17:48:21 -04:00
|
|
|
guint8 *c;
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
v[0] = vertices[i].x;
|
|
|
|
v[1] = vertices[i].y;
|
|
|
|
v[2] = vertices[i].z;
|
|
|
|
|
2009-06-16 17:48:21 -04:00
|
|
|
if (use_color)
|
|
|
|
{
|
|
|
|
/* NB: [X,Y,Z,TX,TY,R,G,B,A,...] */
|
|
|
|
c = (guint8 *) (v + 5);
|
|
|
|
c[0] = cogl_color_get_red_byte (&vertices[i].color);
|
|
|
|
c[1] = cogl_color_get_green_byte (&vertices[i].color);
|
|
|
|
c[2] = cogl_color_get_blue_byte (&vertices[i].color);
|
|
|
|
c[3] = cogl_color_get_alpha_byte (&vertices[i].color);
|
|
|
|
}
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
v += stride;
|
|
|
|
}
|
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
state.stride = stride;
|
|
|
|
state.vertices = vertices;
|
|
|
|
state.n_vertices = n_vertices;
|
2009-03-23 08:29:15 -04:00
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_texture_foreach_sub_texture_in_region (tex_handle,
|
|
|
|
0, 0, 1, 1,
|
|
|
|
draw_polygon_sub_texture_cb,
|
|
|
|
&state);
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_multitexture_polygon_single_primitive (CoglTextureVertex *vertices,
|
|
|
|
guint n_vertices,
|
|
|
|
guint n_layers,
|
|
|
|
guint stride,
|
|
|
|
gboolean use_color,
|
|
|
|
guint32 fallback_layers)
|
2009-03-23 08:29:15 -04:00
|
|
|
{
|
|
|
|
CoglHandle material;
|
|
|
|
const GList *layers;
|
|
|
|
int i;
|
|
|
|
GList *tmp;
|
|
|
|
GLfloat *v;
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
CoglMaterialFlushOptions options;
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
material = ctx->source_material;
|
|
|
|
layers = cogl_material_get_layers (material);
|
|
|
|
|
|
|
|
/* Convert the vertices into an array of GLfloats ready to pass to
|
|
|
|
OpenGL */
|
|
|
|
for (v = (GLfloat *)ctx->logged_vertices->data, i = 0;
|
|
|
|
i < n_vertices;
|
|
|
|
v += stride, i++)
|
|
|
|
{
|
2009-06-16 17:48:21 -04:00
|
|
|
guint8 *c;
|
|
|
|
int j;
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
/* NB: [X,Y,Z,TX,TY...,R,G,B,A,...] */
|
|
|
|
v[0] = vertices[i].x;
|
|
|
|
v[1] = vertices[i].y;
|
|
|
|
v[2] = vertices[i].z;
|
|
|
|
|
|
|
|
for (tmp = (GList *)layers, j = 0; tmp != NULL; tmp = tmp->next, j++)
|
|
|
|
{
|
|
|
|
CoglHandle layer = (CoglHandle)tmp->data;
|
|
|
|
CoglHandle tex_handle;
|
|
|
|
GLfloat *t;
|
|
|
|
float tx, ty;
|
|
|
|
|
|
|
|
tex_handle = cogl_material_layer_get_texture (layer);
|
2009-06-19 07:15:12 -04:00
|
|
|
|
|
|
|
/* COGL_INVALID_HANDLE textures will be handled in
|
|
|
|
* _cogl_material_flush_layers_gl_state but there is no need to worry
|
|
|
|
* about scaling texture coordinates in this case */
|
|
|
|
if (tex_handle == COGL_INVALID_HANDLE)
|
|
|
|
continue;
|
|
|
|
|
2009-09-16 06:56:17 -04:00
|
|
|
tx = vertices[i].tx;
|
|
|
|
ty = vertices[i].ty;
|
|
|
|
_cogl_texture_transform_coords_to_gl (tex_handle, &tx, &ty);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
/* NB: [X,Y,Z,TX,TY...,R,G,B,A,...] */
|
|
|
|
t = v + 3 + 2 * j;
|
|
|
|
t[0] = tx;
|
|
|
|
t[1] = ty;
|
|
|
|
}
|
|
|
|
|
2009-06-16 17:48:21 -04:00
|
|
|
if (use_color)
|
|
|
|
{
|
|
|
|
/* NB: [X,Y,Z,TX,TY...,R,G,B,A,...] */
|
|
|
|
c = (guint8 *) (v + 3 + 2 * n_layers);
|
|
|
|
c[0] = cogl_color_get_red_byte (&vertices[i].color);
|
|
|
|
c[1] = cogl_color_get_green_byte (&vertices[i].color);
|
|
|
|
c[2] = cogl_color_get_blue_byte (&vertices[i].color);
|
|
|
|
c[3] = cogl_color_get_alpha_byte (&vertices[i].color);
|
|
|
|
}
|
2009-03-23 08:29:15 -04:00
|
|
|
}
|
|
|
|
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
options.flags = COGL_MATERIAL_FLUSH_FALLBACK_MASK;
|
|
|
|
if (use_color)
|
|
|
|
options.flags |= COGL_MATERIAL_FLUSH_SKIP_GL_COLOR;
|
|
|
|
options.fallback_layers = fallback_layers;
|
|
|
|
_cogl_material_flush_gl_state (ctx->source_material, &options);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
GE (glDrawArrays (GL_TRIANGLE_FAN, 0, n_vertices));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_polygon (CoglTextureVertex *vertices,
|
|
|
|
guint n_vertices,
|
|
|
|
gboolean use_color)
|
|
|
|
{
|
|
|
|
CoglHandle material;
|
|
|
|
const GList *layers;
|
|
|
|
int n_layers;
|
|
|
|
GList *tmp;
|
|
|
|
gboolean use_sliced_polygon_fallback = FALSE;
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
guint32 fallback_layers = 0;
|
2009-03-23 08:29:15 -04:00
|
|
|
int i;
|
|
|
|
gulong enable_flags;
|
|
|
|
guint stride;
|
|
|
|
gsize stride_bytes;
|
|
|
|
GLfloat *v;
|
|
|
|
int prev_n_texcoord_arrays_enabled;
|
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
_cogl_journal_flush ();
|
2009-09-25 09:34:34 -04:00
|
|
|
|
|
|
|
/* NB: _cogl_draw_buffer_flush_state may disrupt various state (such
|
|
|
|
* as the material state) when flushing the clip stack, so should
|
|
|
|
* always be done first when preparing to draw. */
|
|
|
|
_cogl_draw_buffer_flush_state (_cogl_get_draw_buffer (), 0);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
material = ctx->source_material;
|
|
|
|
layers = cogl_material_get_layers (ctx->source_material);
|
|
|
|
n_layers = g_list_length ((GList *)layers);
|
|
|
|
|
|
|
|
for (tmp = (GList *)layers, i = 0; tmp != NULL; tmp = tmp->next, i++)
|
|
|
|
{
|
|
|
|
CoglHandle layer = (CoglHandle)tmp->data;
|
|
|
|
CoglHandle tex_handle = cogl_material_layer_get_texture (layer);
|
|
|
|
|
2009-06-19 07:15:12 -04:00
|
|
|
/* COGL_INVALID_HANDLE textures will be handled in
|
|
|
|
* _cogl_material_flush_layers_gl_state */
|
|
|
|
if (tex_handle == COGL_INVALID_HANDLE)
|
|
|
|
continue;
|
|
|
|
|
2009-03-23 08:29:15 -04:00
|
|
|
if (i == 0 && cogl_texture_is_sliced (tex_handle))
|
|
|
|
{
|
|
|
|
#if defined (HAVE_COGL_GLES) || defined (HAVE_COGL_GLES2)
|
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
|
|
|
g_warning ("cogl_polygon does not work for sliced textures "
|
|
|
|
"on GL ES");
|
|
|
|
warning_seen = TRUE;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (n_layers > 1)
|
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
|
|
|
{
|
|
|
|
g_warning ("Disabling layers 1..n since multi-texturing with "
|
|
|
|
"cogl_polygon isn't supported when using sliced "
|
|
|
|
"textures\n");
|
|
|
|
warning_seen = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
use_sliced_polygon_fallback = TRUE;
|
|
|
|
n_layers = 1;
|
|
|
|
|
2009-06-04 11:04:57 -04:00
|
|
|
if (cogl_material_layer_get_min_filter (layer) != GL_NEAREST
|
|
|
|
|| cogl_material_layer_get_mag_filter (layer) != GL_NEAREST)
|
2009-03-23 08:29:15 -04:00
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
|
|
|
{
|
|
|
|
g_warning ("cogl_texture_polygon does not work for sliced textures "
|
|
|
|
"when the minification and magnification filters are not "
|
|
|
|
"CGL_NEAREST");
|
|
|
|
warning_seen = TRUE;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef HAVE_COGL_GL
|
2009-06-04 17:20:18 -04:00
|
|
|
{
|
|
|
|
/* Temporarily change the wrapping mode on all of the slices to use
|
|
|
|
* a transparent border
|
|
|
|
* XXX: it's doesn't look like we save/restore this, like
|
|
|
|
* the comment implies? */
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_texture_set_wrap_mode_parameter (tex_handle,
|
|
|
|
GL_CLAMP_TO_BORDER);
|
2009-06-04 17:20:18 -04:00
|
|
|
}
|
2009-03-23 08:29:15 -04:00
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cogl_texture_is_sliced (tex_handle))
|
|
|
|
{
|
|
|
|
static gboolean warning_seen = FALSE;
|
|
|
|
if (!warning_seen)
|
|
|
|
g_warning ("Disabling layer %d of the current source material, "
|
|
|
|
"because texturing with the vertex buffer API is not "
|
|
|
|
"currently supported using sliced textures, or "
|
|
|
|
"textures with waste\n", i);
|
|
|
|
warning_seen = TRUE;
|
|
|
|
|
[cogl] Improving Cogl journal to minimize driver overheads + GPU state changes
Previously the journal was always flushed at the end of
_cogl_rectangles_with_multitexture_coords, (i.e. the end of any
cogl_rectangle* calls) but now we have broadened the potential for batching
geometry. In ideal circumstances we will only flush once per scene.
In summary the journal works like this:
When you use any of the cogl_rectangle* APIs then nothing is emitted to the
GPU at this point, we just log one or more quads into the journal. A
journal entry consists of the quad coordinates, an associated material
reference, and a modelview matrix. Ideally the journal only gets flushed
once at the end of a scene, but in fact there are things to consider that
may cause unwanted flushing, including:
- modifying materials mid-scene
This is because each quad in the journal has an associated material
reference (i.e. not copy), so if you try and modify a material that is
already referenced in the journal we force a flush first)
NOTE: For now this means you should avoid using cogl_set_source_color()
since that currently uses a single shared material. Later we
should change it to use a pool of materials that is recycled
when the journal is flushed.
- modifying any state that isn't currently logged, such as depth, fog and
backface culling enables.
The first thing that happens when flushing, is to upload all the vertex data
associated with the journal into a single VBO.
We then go through a process of splitting up the journal into batches that
have compatible state so they can be emitted to the GPU together. This is
currently broken up into 3 levels so we can stagger the state changes:
1) we break the journal up according to changes in the number of material layers
associated with logged quads. The number of layers in a material determines
the stride of the associated vertices, so we have to update our vertex
array offsets at this level. (i.e. calling gl{Vertex,Color},Pointer etc)
2) we further split batches up according to material compatability. (e.g.
materials with different textures) We flush material state at this level.
3) Finally we split batches up according to modelview changes. At this level
we update the modelview matrix and actually emit the actual draw command.
This commit is largely about putting the initial design in-place; this will be
followed by other changes that take advantage of the extended batching.
2009-06-17 13:46:42 -04:00
|
|
|
fallback_layers |= (1 << i);
|
2009-03-23 08:29:15 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Our data is arranged like:
|
|
|
|
* [X, Y, Z, TX0, TY0, TX1, TY1..., R, G, B, A,...] */
|
2009-06-16 17:48:21 -04:00
|
|
|
stride = 3 + (2 * n_layers) + (use_color ? 1 : 0);
|
2009-03-23 08:29:15 -04:00
|
|
|
stride_bytes = stride * sizeof (GLfloat);
|
|
|
|
|
|
|
|
/* Make sure there is enough space in the global vertex
|
|
|
|
array. This is used so we can render the polygon with a single
|
|
|
|
call to OpenGL but still support any number of vertices */
|
|
|
|
g_array_set_size (ctx->logged_vertices, n_vertices * stride);
|
|
|
|
v = (GLfloat *)ctx->logged_vertices->data;
|
|
|
|
|
|
|
|
/* Prepare GL state */
|
|
|
|
enable_flags = COGL_ENABLE_VERTEX_ARRAY;
|
2009-05-23 12:42:10 -04:00
|
|
|
enable_flags |= _cogl_material_get_cogl_enable_flags (ctx->source_material);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
if (ctx->enable_backface_culling)
|
|
|
|
enable_flags |= COGL_ENABLE_BACKFACE_CULLING;
|
|
|
|
|
|
|
|
if (use_color)
|
|
|
|
{
|
2009-10-27 09:18:51 -04:00
|
|
|
enable_flags |= COGL_ENABLE_COLOR_ARRAY | COGL_ENABLE_BLEND;
|
2009-06-16 17:48:21 -04:00
|
|
|
GE( glColorPointer (4, GL_UNSIGNED_BYTE,
|
2009-03-23 08:29:15 -04:00
|
|
|
stride_bytes,
|
|
|
|
/* NB: [X,Y,Z,TX,TY...,R,G,B,A,...] */
|
|
|
|
v + 3 + 2 * n_layers) );
|
|
|
|
}
|
|
|
|
|
|
|
|
cogl_enable (enable_flags);
|
|
|
|
|
|
|
|
GE (glVertexPointer (3, GL_FLOAT, stride_bytes, v));
|
|
|
|
|
|
|
|
for (i = 0; i < n_layers; i++)
|
|
|
|
{
|
|
|
|
GE (glClientActiveTexture (GL_TEXTURE0 + i));
|
|
|
|
GE (glEnableClientState (GL_TEXTURE_COORD_ARRAY));
|
|
|
|
GE (glTexCoordPointer (2, GL_FLOAT,
|
|
|
|
stride_bytes,
|
|
|
|
/* NB: [X,Y,Z,TX,TY...,R,G,B,A,...] */
|
|
|
|
v + 3 + 2 * i));
|
|
|
|
}
|
|
|
|
prev_n_texcoord_arrays_enabled =
|
|
|
|
ctx->n_texcoord_arrays_enabled;
|
|
|
|
ctx->n_texcoord_arrays_enabled = n_layers;
|
|
|
|
for (; i < prev_n_texcoord_arrays_enabled; i++)
|
|
|
|
{
|
|
|
|
GE (glClientActiveTexture (GL_TEXTURE0 + i));
|
|
|
|
GE (glDisableClientState (GL_TEXTURE_COORD_ARRAY));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (use_sliced_polygon_fallback)
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_texture_polygon_multiple_primitives (vertices,
|
|
|
|
n_vertices,
|
|
|
|
stride,
|
|
|
|
use_color);
|
2009-03-23 08:29:15 -04:00
|
|
|
else
|
2009-09-16 06:56:17 -04:00
|
|
|
_cogl_multitexture_polygon_single_primitive (vertices,
|
|
|
|
n_vertices,
|
|
|
|
n_layers,
|
|
|
|
stride,
|
|
|
|
use_color,
|
|
|
|
fallback_layers);
|
2009-03-23 08:29:15 -04:00
|
|
|
|
|
|
|
/* Reset the size of the logged vertex array because rendering
|
|
|
|
rectangles expects it to start at 0 */
|
|
|
|
g_array_set_size (ctx->logged_vertices, 0);
|
|
|
|
}
|
|
|
|
|
2008-05-05 08:01:19 -04:00
|
|
|
void
|
|
|
|
cogl_path_fill (void)
|
2008-12-04 08:45:09 -05:00
|
|
|
{
|
|
|
|
cogl_path_fill_preserve ();
|
|
|
|
|
|
|
|
cogl_path_new ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_path_fill_preserve (void)
|
2008-05-05 08:01:19 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2008-12-04 08:45:09 -05:00
|
|
|
|
|
|
|
if (ctx->path_nodes->len == 0)
|
2009-04-27 10:48:12 -04:00
|
|
|
return;
|
2008-12-04 08:45:09 -05:00
|
|
|
|
|
|
|
_cogl_path_fill_nodes ();
|
2008-05-05 08:01:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_path_stroke (void)
|
2008-12-04 08:45:09 -05:00
|
|
|
{
|
|
|
|
cogl_path_stroke_preserve ();
|
|
|
|
|
|
|
|
cogl_path_new ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
cogl_path_stroke_preserve (void)
|
2008-05-05 08:01:19 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-12-04 08:45:09 -05:00
|
|
|
if (ctx->path_nodes->len == 0)
|
2008-05-05 08:01:19 -04:00
|
|
|
return;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2009-09-25 09:34:34 -04:00
|
|
|
_cogl_path_stroke_nodes ();
|
2008-05-05 08:01:19 -04:00
|
|
|
}
|
2008-04-30 11:05:17 -04:00
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_move_to (float x,
|
|
|
|
float y)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* FIXME: handle multiple contours maybe? */
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-12-04 08:45:09 -05:00
|
|
|
_cogl_path_add_node (TRUE, x, y);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
ctx->path_start.x = x;
|
|
|
|
ctx->path_start.y = y;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
ctx->path_pen = ctx->path_start;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_rel_move_to (float x,
|
|
|
|
float y)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_move_to (ctx->path_pen.x + x,
|
2008-05-05 06:25:11 -04:00
|
|
|
ctx->path_pen.y + y);
|
2008-04-30 11:05:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_line_to (float x,
|
|
|
|
float y)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-12-04 08:45:09 -05:00
|
|
|
_cogl_path_add_node (FALSE, x, y);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
ctx->path_pen.x = x;
|
|
|
|
ctx->path_pen.y = y;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_rel_line_to (float x,
|
|
|
|
float y)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_line_to (ctx->path_pen.x + x,
|
|
|
|
ctx->path_pen.y + y);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2008-05-05 06:25:11 -04:00
|
|
|
cogl_path_close (void)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-12-04 08:45:09 -05:00
|
|
|
_cogl_path_add_node (FALSE, ctx->path_start.x, ctx->path_start.y);
|
2008-04-30 11:05:17 -04:00
|
|
|
ctx->path_pen = ctx->path_start;
|
|
|
|
}
|
|
|
|
|
2008-12-04 08:45:09 -05:00
|
|
|
void
|
|
|
|
cogl_path_new (void)
|
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
|
|
|
g_array_set_size (ctx->path_nodes, 0);
|
|
|
|
}
|
2008-04-30 11:05:17 -04:00
|
|
|
|
|
|
|
void
|
2009-01-23 08:08:46 -05:00
|
|
|
cogl_path_line (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
2009-01-23 08:08:46 -05:00
|
|
|
cogl_path_move_to (x_1, y_1);
|
|
|
|
cogl_path_line_to (x_2, y_2);
|
2008-04-30 11:05:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_polyline (float *coords,
|
2008-05-05 06:25:11 -04:00
|
|
|
gint num_points)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
gint c = 0;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_move_to (coords[0], coords[1]);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
for (c = 1; c < num_points; ++c)
|
|
|
|
cogl_path_line_to (coords[2*c], coords[2*c+1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_polygon (float *coords,
|
2008-05-05 06:25:11 -04:00
|
|
|
gint num_points)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
2008-05-05 06:25:11 -04:00
|
|
|
cogl_path_polyline (coords, num_points);
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_close ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-13 11:28:20 -04:00
|
|
|
cogl_path_rectangle (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
2009-03-13 11:28:20 -04:00
|
|
|
cogl_path_move_to (x_1, y_1);
|
|
|
|
cogl_path_line_to (x_2, y_1);
|
|
|
|
cogl_path_line_to (x_2, y_2);
|
|
|
|
cogl_path_line_to (x_1, y_2);
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_close ();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-01-20 11:20:54 -05:00
|
|
|
_cogl_path_arc (float center_x,
|
|
|
|
float center_y,
|
|
|
|
float radius_x,
|
|
|
|
float radius_y,
|
|
|
|
float angle_1,
|
|
|
|
float angle_2,
|
|
|
|
float angle_step,
|
2008-05-05 06:25:11 -04:00
|
|
|
guint move_first)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
2009-01-20 11:20:54 -05:00
|
|
|
float a = 0x0;
|
|
|
|
float cosa = 0x0;
|
|
|
|
float sina = 0x0;
|
|
|
|
float px = 0x0;
|
|
|
|
float py = 0x0;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Fix invalid angles */
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
if (angle_1 == angle_2 || angle_step == 0x0)
|
|
|
|
return;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
if (angle_step < 0x0)
|
|
|
|
angle_step = -angle_step;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Walk the arc by given step */
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-06-10 06:05:12 -04:00
|
|
|
a = angle_1;
|
|
|
|
while (a != angle_2)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
2009-01-20 11:20:54 -05:00
|
|
|
cosa = cosf (a * (G_PI/180.0));
|
|
|
|
sina = sinf (a * (G_PI/180.0));
|
2008-04-30 11:05:17 -04:00
|
|
|
|
2009-01-20 11:20:54 -05:00
|
|
|
px = center_x + (cosa * radius_x);
|
|
|
|
py = center_y + (sina * radius_y);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
if (a == angle_1 && move_first)
|
|
|
|
cogl_path_move_to (px, py);
|
|
|
|
else
|
|
|
|
cogl_path_line_to (px, py);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-06-10 06:05:12 -04:00
|
|
|
if (G_LIKELY (angle_2 > angle_1))
|
|
|
|
{
|
|
|
|
a += angle_step;
|
|
|
|
if (a > angle_2)
|
|
|
|
a = angle_2;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
a -= angle_step;
|
|
|
|
if (a < angle_2)
|
|
|
|
a = angle_2;
|
|
|
|
}
|
2008-04-30 11:05:17 -04:00
|
|
|
}
|
2008-06-10 06:05:12 -04:00
|
|
|
|
|
|
|
/* Make sure the final point is drawn */
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2009-01-20 11:20:54 -05:00
|
|
|
cosa = cosf (angle_2 * (G_PI/180.0));
|
|
|
|
sina = sinf (angle_2 * (G_PI/180.0));
|
2008-06-10 06:05:12 -04:00
|
|
|
|
2009-01-20 11:20:54 -05:00
|
|
|
px = center_x + (cosa * radius_x);
|
|
|
|
py = center_y + (sina * radius_y);
|
2008-06-10 06:05:12 -04:00
|
|
|
|
|
|
|
cogl_path_line_to (px, py);
|
2008-04-30 11:05:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_arc (float center_x,
|
|
|
|
float center_y,
|
|
|
|
float radius_x,
|
|
|
|
float radius_y,
|
|
|
|
float angle_1,
|
|
|
|
float angle_2)
|
2009-04-27 10:48:12 -04:00
|
|
|
{
|
2009-01-20 11:20:54 -05:00
|
|
|
float angle_step = 10;
|
2008-05-05 06:25:11 -04:00
|
|
|
/* it is documented that a move to is needed to create a freestanding
|
|
|
|
* arc
|
|
|
|
*/
|
|
|
|
_cogl_path_arc (center_x, center_y,
|
|
|
|
radius_x, radius_y,
|
|
|
|
angle_1, angle_2,
|
|
|
|
angle_step, 0 /* no move */);
|
2008-04-30 11:05:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_arc_rel (float center_x,
|
|
|
|
float center_y,
|
|
|
|
float radius_x,
|
|
|
|
float radius_y,
|
|
|
|
float angle_1,
|
|
|
|
float angle_2,
|
|
|
|
float angle_step)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
_cogl_path_arc (ctx->path_pen.x + center_x,
|
|
|
|
ctx->path_pen.y + center_y,
|
|
|
|
radius_x, radius_y,
|
|
|
|
angle_1, angle_2,
|
|
|
|
angle_step, 0 /* no move */);
|
2008-04-30 11:05:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-20 11:20:54 -05:00
|
|
|
cogl_path_ellipse (float center_x,
|
|
|
|
float center_y,
|
|
|
|
float radius_x,
|
|
|
|
float radius_y)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
2009-01-20 11:20:54 -05:00
|
|
|
float angle_step = 10;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* FIXME: if shows to be slow might be optimized
|
|
|
|
* by mirroring just a quarter of it */
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
_cogl_path_arc (center_x, center_y,
|
|
|
|
radius_x, radius_y,
|
2009-01-20 11:20:54 -05:00
|
|
|
0, 360,
|
2008-05-05 06:25:11 -04:00
|
|
|
angle_step, 1 /* move first */);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_close();
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-03-13 11:28:20 -04:00
|
|
|
cogl_path_round_rectangle (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2,
|
2009-01-20 11:20:54 -05:00
|
|
|
float radius,
|
|
|
|
float arc_step)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
2009-03-13 11:28:20 -04:00
|
|
|
float inner_width = x_2 - x_1 - radius * 2;
|
|
|
|
float inner_height = y_2 - y_1 - radius * 2;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-06-23 07:01:30 -04:00
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
2009-03-13 11:28:20 -04:00
|
|
|
cogl_path_move_to (x_1, y_1 + radius);
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_arc_rel (radius, 0,
|
|
|
|
radius, radius,
|
2009-01-20 11:20:54 -05:00
|
|
|
180,
|
|
|
|
270,
|
2008-04-30 11:05:17 -04:00
|
|
|
arc_step);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_line_to (ctx->path_pen.x + inner_width,
|
|
|
|
ctx->path_pen.y);
|
|
|
|
cogl_path_arc_rel (0, radius,
|
|
|
|
radius, radius,
|
2009-01-20 11:20:54 -05:00
|
|
|
-90,
|
|
|
|
0,
|
2008-04-30 11:05:17 -04:00
|
|
|
arc_step);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_line_to (ctx->path_pen.x,
|
|
|
|
ctx->path_pen.y + inner_height);
|
|
|
|
|
|
|
|
cogl_path_arc_rel (-radius, 0,
|
|
|
|
radius, radius,
|
2009-01-20 11:20:54 -05:00
|
|
|
0,
|
|
|
|
90,
|
2008-04-30 11:05:17 -04:00
|
|
|
arc_step);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_line_to (ctx->path_pen.x - inner_width,
|
|
|
|
ctx->path_pen.y);
|
|
|
|
cogl_path_arc_rel (0, -radius,
|
|
|
|
radius, radius,
|
2009-01-20 11:20:54 -05:00
|
|
|
90,
|
|
|
|
180,
|
2008-04-30 11:05:17 -04:00
|
|
|
arc_step);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
cogl_path_close ();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_path_bezier3_sub (CoglBezCubic *cubic)
|
|
|
|
{
|
|
|
|
CoglBezCubic cubics[_COGL_MAX_BEZ_RECURSE_DEPTH];
|
|
|
|
CoglBezCubic *cleft;
|
|
|
|
CoglBezCubic *cright;
|
|
|
|
CoglBezCubic *c;
|
2009-01-20 11:20:54 -05:00
|
|
|
floatVec2 dif1;
|
|
|
|
floatVec2 dif2;
|
|
|
|
floatVec2 mm;
|
|
|
|
floatVec2 c1;
|
|
|
|
floatVec2 c2;
|
|
|
|
floatVec2 c3;
|
|
|
|
floatVec2 c4;
|
|
|
|
floatVec2 c5;
|
2008-04-30 11:05:17 -04:00
|
|
|
gint cindex;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Put first curve on stack */
|
|
|
|
cubics[0] = *cubic;
|
|
|
|
cindex = 0;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
while (cindex >= 0)
|
|
|
|
{
|
|
|
|
c = &cubics[cindex];
|
2009-04-27 10:48:12 -04:00
|
|
|
|
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Calculate distance of control points from their
|
|
|
|
* counterparts on the line between end points */
|
2009-01-20 11:20:54 -05:00
|
|
|
dif1.x = (c->p2.x * 3) - (c->p1.x * 2) - c->p4.x;
|
|
|
|
dif1.y = (c->p2.y * 3) - (c->p1.y * 2) - c->p4.y;
|
|
|
|
dif2.x = (c->p3.x * 3) - (c->p4.x * 2) - c->p1.x;
|
|
|
|
dif2.y = (c->p3.y * 3) - (c->p4.y * 2) - c->p1.y;
|
2008-10-30 12:37:55 -04:00
|
|
|
|
|
|
|
if (dif1.x < 0)
|
|
|
|
dif1.x = -dif1.x;
|
|
|
|
if (dif1.y < 0)
|
|
|
|
dif1.y = -dif1.y;
|
|
|
|
if (dif2.x < 0)
|
|
|
|
dif2.x = -dif2.x;
|
|
|
|
if (dif2.y < 0)
|
|
|
|
dif2.y = -dif2.y;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Pick the greatest of two distances */
|
|
|
|
if (dif1.x < dif2.x) dif1.x = dif2.x;
|
|
|
|
if (dif1.y < dif2.y) dif1.y = dif2.y;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Cancel if the curve is flat enough */
|
2009-01-20 11:20:54 -05:00
|
|
|
if (dif1.x + dif1.y <= 1.0 ||
|
2008-10-30 12:37:55 -04:00
|
|
|
cindex == _COGL_MAX_BEZ_RECURSE_DEPTH-1)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
/* Add subdivision point (skip last) */
|
2008-10-30 12:37:55 -04:00
|
|
|
if (cindex == 0)
|
|
|
|
return;
|
|
|
|
|
2008-12-04 08:45:09 -05:00
|
|
|
_cogl_path_add_node (FALSE, c->p4.x, c->p4.y);
|
2008-10-30 12:37:55 -04:00
|
|
|
|
|
|
|
--cindex;
|
|
|
|
|
|
|
|
continue;
|
2008-04-30 11:05:17 -04:00
|
|
|
}
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Left recursion goes on top of stack! */
|
|
|
|
cright = c; cleft = &cubics[++cindex];
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Subdivide into 2 sub-curves */
|
2009-01-20 11:20:54 -05:00
|
|
|
c1.x = ((c->p1.x + c->p2.x) / 2);
|
|
|
|
c1.y = ((c->p1.y + c->p2.y) / 2);
|
|
|
|
mm.x = ((c->p2.x + c->p3.x) / 2);
|
|
|
|
mm.y = ((c->p2.y + c->p3.y) / 2);
|
|
|
|
c5.x = ((c->p3.x + c->p4.x) / 2);
|
|
|
|
c5.y = ((c->p3.y + c->p4.y) / 2);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2009-01-20 11:20:54 -05:00
|
|
|
c2.x = ((c1.x + mm.x) / 2);
|
|
|
|
c2.y = ((c1.y + mm.y) / 2);
|
|
|
|
c4.x = ((mm.x + c5.x) / 2);
|
|
|
|
c4.y = ((mm.y + c5.y) / 2);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2009-01-20 11:20:54 -05:00
|
|
|
c3.x = ((c2.x + c4.x) / 2);
|
|
|
|
c3.y = ((c2.y + c4.y) / 2);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Add left recursion to stack */
|
|
|
|
cleft->p1 = c->p1;
|
|
|
|
cleft->p2 = c1;
|
|
|
|
cleft->p3 = c2;
|
|
|
|
cleft->p4 = c3;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Add right recursion to stack */
|
|
|
|
cright->p1 = c3;
|
|
|
|
cright->p2 = c4;
|
|
|
|
cright->p3 = c5;
|
|
|
|
cright->p4 = c->p4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-23 08:08:46 -05:00
|
|
|
cogl_path_curve_to (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2,
|
|
|
|
float x_3,
|
|
|
|
float y_3)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
CoglBezCubic cubic;
|
2008-06-23 07:01:30 -04:00
|
|
|
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Prepare cubic curve */
|
|
|
|
cubic.p1 = ctx->path_pen;
|
2009-01-23 08:08:46 -05:00
|
|
|
cubic.p2.x = x_1;
|
|
|
|
cubic.p2.y = y_1;
|
|
|
|
cubic.p3.x = x_2;
|
|
|
|
cubic.p3.y = y_2;
|
|
|
|
cubic.p4.x = x_3;
|
|
|
|
cubic.p4.y = y_3;
|
2008-06-23 07:01:30 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Run subdivision */
|
|
|
|
_cogl_path_bezier3_sub (&cubic);
|
2008-06-23 07:01:30 -04:00
|
|
|
|
2008-04-30 11:05:17 -04:00
|
|
|
/* Add last point */
|
2008-12-04 08:45:09 -05:00
|
|
|
_cogl_path_add_node (FALSE, cubic.p4.x, cubic.p4.y);
|
2008-04-30 11:05:17 -04:00
|
|
|
ctx->path_pen = cubic.p4;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-23 08:08:46 -05:00
|
|
|
cogl_path_rel_curve_to (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2,
|
|
|
|
float x_3,
|
|
|
|
float y_3)
|
2008-04-30 11:05:17 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2009-01-23 08:08:46 -05:00
|
|
|
cogl_path_curve_to (ctx->path_pen.x + x_1,
|
|
|
|
ctx->path_pen.y + y_1,
|
|
|
|
ctx->path_pen.x + x_2,
|
|
|
|
ctx->path_pen.y + y_2,
|
|
|
|
ctx->path_pen.x + x_3,
|
|
|
|
ctx->path_pen.y + y_3);
|
2008-04-30 11:05:17 -04:00
|
|
|
}
|
2008-05-05 06:25:11 -04:00
|
|
|
|
|
|
|
|
|
|
|
/* If second order beziers were needed the following code could
|
|
|
|
* be re-enabled:
|
|
|
|
*/
|
|
|
|
#if 0
|
|
|
|
|
|
|
|
static void
|
|
|
|
_cogl_path_bezier2_sub (CoglBezQuad *quad)
|
|
|
|
{
|
|
|
|
CoglBezQuad quads[_COGL_MAX_BEZ_RECURSE_DEPTH];
|
|
|
|
CoglBezQuad *qleft;
|
|
|
|
CoglBezQuad *qright;
|
|
|
|
CoglBezQuad *q;
|
2009-01-20 11:20:54 -05:00
|
|
|
floatVec2 mid;
|
|
|
|
floatVec2 dif;
|
|
|
|
floatVec2 c1;
|
|
|
|
floatVec2 c2;
|
|
|
|
floatVec2 c3;
|
2008-05-05 06:25:11 -04:00
|
|
|
gint qindex;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Put first curve on stack */
|
|
|
|
quads[0] = *quad;
|
|
|
|
qindex = 0;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* While stack is not empty */
|
|
|
|
while (qindex >= 0)
|
|
|
|
{
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
q = &quads[qindex];
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Calculate distance of control point from its
|
|
|
|
* counterpart on the line between end points */
|
2009-01-20 11:20:54 -05:00
|
|
|
mid.x = ((q->p1.x + q->p3.x) / 2);
|
|
|
|
mid.y = ((q->p1.y + q->p3.y) / 2);
|
2008-05-05 06:25:11 -04:00
|
|
|
dif.x = (q->p2.x - mid.x);
|
|
|
|
dif.y = (q->p2.y - mid.y);
|
|
|
|
if (dif.x < 0) dif.x = -dif.x;
|
|
|
|
if (dif.y < 0) dif.y = -dif.y;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Cancel if the curve is flat enough */
|
2009-01-20 11:20:54 -05:00
|
|
|
if (dif.x + dif.y <= 1.0 ||
|
2008-10-30 12:37:55 -04:00
|
|
|
qindex == _COGL_MAX_BEZ_RECURSE_DEPTH - 1)
|
2008-05-05 06:25:11 -04:00
|
|
|
{
|
|
|
|
/* Add subdivision point (skip last) */
|
|
|
|
if (qindex == 0) return;
|
2008-12-04 08:45:09 -05:00
|
|
|
_cogl_path_add_node (FALSE, q->p3.x, q->p3.y);
|
2008-05-05 06:25:11 -04:00
|
|
|
--qindex; continue;
|
|
|
|
}
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Left recursion goes on top of stack! */
|
|
|
|
qright = q; qleft = &quads[++qindex];
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Subdivide into 2 sub-curves */
|
2009-01-20 11:20:54 -05:00
|
|
|
c1.x = ((q->p1.x + q->p2.x) / 2);
|
|
|
|
c1.y = ((q->p1.y + q->p2.y) / 2);
|
|
|
|
c3.x = ((q->p2.x + q->p3.x) / 2);
|
|
|
|
c3.y = ((q->p2.y + q->p3.y) / 2);
|
|
|
|
c2.x = ((c1.x + c3.x) / 2);
|
|
|
|
c2.y = ((c1.y + c3.y) / 2);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Add left recursion onto stack */
|
|
|
|
qleft->p1 = q->p1;
|
|
|
|
qleft->p2 = c1;
|
|
|
|
qleft->p3 = c2;
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Add right recursion onto stack */
|
|
|
|
qright->p1 = c2;
|
|
|
|
qright->p2 = c3;
|
|
|
|
qright->p3 = q->p3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-23 08:08:46 -05:00
|
|
|
cogl_path_curve2_to (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2)
|
2008-05-05 06:25:11 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-01-23 08:08:46 -05:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
CoglBezQuad quad;
|
2009-01-23 08:08:46 -05:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Prepare quadratic curve */
|
|
|
|
quad.p1 = ctx->path_pen;
|
2009-01-23 08:08:46 -05:00
|
|
|
quad.p2.x = x_1;
|
|
|
|
quad.p2.y = y_1;
|
|
|
|
quad.p3.x = x_2;
|
|
|
|
quad.p3.y = y_2;
|
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Run subdivision */
|
|
|
|
_cogl_path_bezier2_sub (&quad);
|
2009-04-27 10:48:12 -04:00
|
|
|
|
2008-05-05 06:25:11 -04:00
|
|
|
/* Add last point */
|
2008-12-04 08:45:09 -05:00
|
|
|
_cogl_path_add_node (FALSE, quad.p3.x, quad.p3.y);
|
2008-05-05 06:25:11 -04:00
|
|
|
ctx->path_pen = quad.p3;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2009-01-23 08:08:46 -05:00
|
|
|
cogl_rel_curve2_to (float x_1,
|
|
|
|
float y_1,
|
|
|
|
float x_2,
|
|
|
|
float y_2)
|
2008-05-05 06:25:11 -04:00
|
|
|
{
|
|
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
2009-01-23 08:08:46 -05:00
|
|
|
|
|
|
|
cogl_path_curve2_to (ctx->path_pen.x + x_1,
|
|
|
|
ctx->path_pen.y + y_1,
|
|
|
|
ctx->path_pen.x + x_2,
|
|
|
|
ctx->path_pen.y + y_2);
|
2008-05-05 06:25:11 -04:00
|
|
|
}
|
|
|
|
#endif
|