mirror of
https://github.com/brl/mutter.git
synced 2024-12-26 21:02:14 +00:00
185630085c
This option to GCC makes it give a warning whenever a global function is defined without a declaration. This should catch cases were we've defined a function but forgot to put it in a header. In that case it is either only used within one file so we should make it static or we should declare it in a header. The following changes where made to fix problems: • Some functions were made static • cogl-path.h (the one containing the 1.0 API) was split into two files, one defining the functions and one defining the enums so that cogl-path.c can include the enum and function declarations from the 2.0 API as well as the function declarations from the 1.0 API. • cogl2-clip-state has been removed. This only had one experimental function called cogl_clip_push_from_path but as this is unstable we might as well remove it favour of the equivalent cogl_framebuffer_* API. • The GLX, SDL and WGL winsys's now have a private header to define their get_vtable function instead of directly declaring in the C file where it is called. • All places that were calling COGL_OBJECT_DEFINE need to have the cogl_is_whatever function declared so these have been added either as a public function or in a private header. • Some files that were not including the header containing their function declarations have been fixed to do so. • Any unused error quark functions have been removed. If we later want them we should add them back one by one and add a declaration for them in a header. • _cogl_is_framebuffer has been renamed to cogl_is_framebuffer and made a public function with a declaration in cogl-framebuffer.h • Similarly for CoglOnscreen. • cogl_vdraw_indexed_attributes is called cogl_framebuffer_vdraw_indexed_attributes in the header. The definition has been changed to match the header. • cogl_index_buffer_allocate has been removed. This had no declaration and I'm not sure what it's supposed to do. • CoglJournal has been changed to use the internal CoglObject macro so that it won't define an exported cogl_is_journal symbol. • The _cogl_blah_pointer_from_handle functions have been removed. CoglHandle isn't used much anymore anyway and in the few places where it is used I think it's safe to just use the implicit cast from void* to the right type. • The test-utils.h header for the conformance tests explicitly disables the -Wmissing-declaration option using a pragma because all of the tests declare their main function without a header. Any mistakes relating to missing declarations aren't really important for the tests. • cogl_quaternion_init_from_quaternion and init_from_matrix have been given declarations in cogl-quaternion.h Reviewed-by: Robert Bragg <robert@linux.intel.com>
307 lines
6.4 KiB
C
307 lines
6.4 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2010 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Authors:
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "cogl-util.h"
|
|
#include "cogl-internal.h"
|
|
#include "cogl-context-private.h"
|
|
#include "cogl2-path.h"
|
|
|
|
#include <string.h>
|
|
#include <math.h>
|
|
|
|
#undef cogl_path_set_fill_rule
|
|
#undef cogl_path_get_fill_rule
|
|
#undef cogl_path_fill
|
|
#undef cogl_path_fill_preserve
|
|
#undef cogl_path_stroke
|
|
#undef cogl_path_stroke_preserve
|
|
#undef cogl_path_move_to
|
|
#undef cogl_path_rel_move_to
|
|
#undef cogl_path_line_to
|
|
#undef cogl_path_rel_line_to
|
|
#undef cogl_path_close
|
|
#undef cogl_path_new
|
|
#undef cogl_path_line
|
|
#undef cogl_path_polyline
|
|
#undef cogl_path_polygon
|
|
#undef cogl_path_rectangle
|
|
#undef cogl_path_arc
|
|
#undef cogl_path_ellipse
|
|
#undef cogl_path_round_rectangle
|
|
#undef cogl_path_curve_to
|
|
#undef cogl_path_rel_curve_to
|
|
|
|
#include "cogl-path-functions.h"
|
|
|
|
void
|
|
cogl_path_set_fill_rule (CoglPathFillRule fill_rule)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_set_fill_rule (ctx->current_path, fill_rule);
|
|
}
|
|
|
|
CoglPathFillRule
|
|
cogl_path_get_fill_rule (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, COGL_PATH_FILL_RULE_EVEN_ODD);
|
|
|
|
return cogl2_path_get_fill_rule (ctx->current_path);
|
|
}
|
|
|
|
void
|
|
cogl_path_fill (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_fill (ctx->current_path);
|
|
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|
|
|
|
void
|
|
cogl_path_fill_preserve (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_fill (ctx->current_path);
|
|
}
|
|
|
|
void
|
|
cogl_path_stroke (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_stroke (ctx->current_path);
|
|
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|
|
|
|
void
|
|
cogl_path_stroke_preserve (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_stroke (ctx->current_path);
|
|
}
|
|
|
|
void
|
|
cogl_path_move_to (float x,
|
|
float y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_move_to (ctx->current_path, x, y);
|
|
}
|
|
|
|
void
|
|
cogl_path_rel_move_to (float x,
|
|
float y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_rel_move_to (ctx->current_path, x, y);
|
|
}
|
|
|
|
void
|
|
cogl_path_line_to (float x,
|
|
float y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_line_to (ctx->current_path, x, y);
|
|
}
|
|
|
|
void
|
|
cogl_path_rel_line_to (float x,
|
|
float y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_rel_line_to (ctx->current_path, x, y);
|
|
}
|
|
|
|
void
|
|
cogl_path_close (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_close (ctx->current_path);
|
|
}
|
|
|
|
void
|
|
cogl_path_new (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|
|
|
|
void
|
|
cogl_path_line (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_line (ctx->current_path, x_1, y_1, x_2, y_2);
|
|
}
|
|
|
|
void
|
|
cogl_path_polyline (const float *coords,
|
|
int num_points)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_polyline (ctx->current_path, coords, num_points);
|
|
}
|
|
|
|
void
|
|
cogl_path_polygon (const float *coords,
|
|
int num_points)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_polygon (ctx->current_path, coords, num_points);
|
|
}
|
|
|
|
void
|
|
cogl_path_rectangle (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_rectangle (ctx->current_path, x_1, y_1, x_2, y_2);
|
|
}
|
|
|
|
void
|
|
cogl_path_arc (float center_x,
|
|
float center_y,
|
|
float radius_x,
|
|
float radius_y,
|
|
float angle_1,
|
|
float angle_2)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_arc (ctx->current_path,
|
|
center_x,
|
|
center_y,
|
|
radius_x,
|
|
radius_y,
|
|
angle_1,
|
|
angle_2);
|
|
}
|
|
|
|
void
|
|
cogl_path_ellipse (float center_x,
|
|
float center_y,
|
|
float radius_x,
|
|
float radius_y)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_ellipse (ctx->current_path,
|
|
center_x,
|
|
center_y,
|
|
radius_x,
|
|
radius_y);
|
|
}
|
|
|
|
void
|
|
cogl_path_round_rectangle (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2,
|
|
float radius,
|
|
float arc_step)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_round_rectangle (ctx->current_path,
|
|
x_1, y_1, x_2, y_2, radius, arc_step);
|
|
}
|
|
|
|
void
|
|
cogl_path_curve_to (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2,
|
|
float x_3,
|
|
float y_3)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_curve_to (ctx->current_path,
|
|
x_1, y_2, x_2, y_2, x_3, y_3);
|
|
}
|
|
|
|
void
|
|
cogl_path_rel_curve_to (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2,
|
|
float x_3,
|
|
float y_3)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl2_path_rel_curve_to (ctx->current_path,
|
|
x_1, y_1, x_2, y_2, x_3, y_3);
|
|
}
|
|
|
|
CoglPath *
|
|
cogl_get_path (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NULL);
|
|
|
|
return ctx->current_path;
|
|
}
|
|
|
|
void
|
|
cogl_set_path (CoglPath *path)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
_COGL_RETURN_IF_FAIL (cogl_is_path (path));
|
|
|
|
/* Reference the new object first in case it is the same as the old
|
|
object */
|
|
cogl_object_ref (path);
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = path;
|
|
}
|
|
|