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>
208 lines
5.2 KiB
C
208 lines
5.2 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2007,2008,2009,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/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include <math.h>
|
|
|
|
#include <glib.h>
|
|
|
|
#include "cogl-clip-stack.h"
|
|
#include "cogl-clip-state-private.h"
|
|
#include "cogl-context-private.h"
|
|
#include "cogl-internal.h"
|
|
#include "cogl-framebuffer-private.h"
|
|
#include "cogl-journal-private.h"
|
|
#include "cogl-util.h"
|
|
#include "cogl-matrix-private.h"
|
|
#include "cogl-clip-state.h"
|
|
#include "cogl1-context.h"
|
|
|
|
void
|
|
cogl_clip_push_window_rectangle (int x_offset,
|
|
int y_offset,
|
|
int width,
|
|
int height)
|
|
{
|
|
cogl_framebuffer_push_scissor_clip (cogl_get_draw_framebuffer (),
|
|
x_offset, y_offset, width, height);
|
|
}
|
|
|
|
/* XXX: This is deprecated API */
|
|
void
|
|
cogl_clip_push_window_rect (float x_offset,
|
|
float y_offset,
|
|
float width,
|
|
float height)
|
|
{
|
|
cogl_clip_push_window_rectangle (x_offset, y_offset, width, height);
|
|
}
|
|
|
|
void
|
|
cogl_clip_push_rectangle (float x_1,
|
|
float y_1,
|
|
float x_2,
|
|
float y_2)
|
|
{
|
|
cogl_framebuffer_push_rectangle_clip (cogl_get_draw_framebuffer (),
|
|
x_1, y_1, x_2, y_2);
|
|
}
|
|
|
|
/* XXX: Deprecated API */
|
|
void
|
|
cogl_clip_push (float x_offset,
|
|
float y_offset,
|
|
float width,
|
|
float height)
|
|
{
|
|
cogl_clip_push_rectangle (x_offset,
|
|
y_offset,
|
|
x_offset + width,
|
|
y_offset + height);
|
|
}
|
|
|
|
void
|
|
cogl_clip_push_from_path_preserve (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
cogl_framebuffer_push_path_clip (cogl_get_draw_framebuffer (),
|
|
ctx->current_path);
|
|
}
|
|
|
|
#undef cogl_clip_push_from_path
|
|
void
|
|
cogl_clip_push_from_path (void)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
cogl_clip_push_from_path_preserve ();
|
|
|
|
cogl_object_unref (ctx->current_path);
|
|
ctx->current_path = cogl2_path_new ();
|
|
}
|
|
|
|
void
|
|
cogl_clip_push_primitive (CoglPrimitive *primitive,
|
|
float bounds_x1,
|
|
float bounds_y1,
|
|
float bounds_x2,
|
|
float bounds_y2)
|
|
{
|
|
cogl_framebuffer_push_primitive_clip (cogl_get_draw_framebuffer (),
|
|
primitive,
|
|
bounds_x1,
|
|
bounds_y1,
|
|
bounds_x2,
|
|
bounds_y2);
|
|
}
|
|
|
|
void
|
|
cogl_clip_pop (void)
|
|
{
|
|
cogl_framebuffer_pop_clip (cogl_get_draw_framebuffer ());
|
|
}
|
|
|
|
void
|
|
cogl_clip_stack_save (void)
|
|
{
|
|
_cogl_framebuffer_save_clip_stack (cogl_get_draw_framebuffer ());
|
|
}
|
|
|
|
void
|
|
cogl_clip_stack_restore (void)
|
|
{
|
|
_cogl_framebuffer_restore_clip_stack (cogl_get_draw_framebuffer ());
|
|
}
|
|
|
|
/* XXX: This should never have been made public API! */
|
|
void
|
|
cogl_clip_ensure (void)
|
|
{
|
|
/* Do nothing.
|
|
*
|
|
* This API shouldn't be used by anyone and the documented semantics
|
|
* are basically vague enough that we can get away with doing
|
|
* nothing here.
|
|
*/
|
|
}
|
|
|
|
void
|
|
_cogl_clip_state_init (CoglClipState *clip_state)
|
|
{
|
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
|
|
clip_state->stacks = NULL;
|
|
|
|
/* Add an intial stack */
|
|
_cogl_clip_state_save_clip_stack (clip_state);
|
|
}
|
|
|
|
void
|
|
_cogl_clip_state_destroy (CoglClipState *clip_state)
|
|
{
|
|
/* Destroy all of the stacks */
|
|
while (clip_state->stacks)
|
|
_cogl_clip_state_restore_clip_stack (clip_state);
|
|
}
|
|
|
|
CoglClipStack *
|
|
_cogl_clip_state_get_stack (CoglClipState *clip_state)
|
|
{
|
|
return clip_state->stacks->data;
|
|
}
|
|
|
|
void
|
|
_cogl_clip_state_set_stack (CoglClipState *clip_state,
|
|
CoglClipStack *stack)
|
|
{
|
|
/* Replace the top of the stack of stacks */
|
|
_cogl_clip_stack_ref (stack);
|
|
_cogl_clip_stack_unref (clip_state->stacks->data);
|
|
clip_state->stacks->data = stack;
|
|
}
|
|
|
|
void
|
|
_cogl_clip_state_save_clip_stack (CoglClipState *clip_state)
|
|
{
|
|
clip_state->stacks = g_slist_prepend (clip_state->stacks, NULL);
|
|
}
|
|
|
|
void
|
|
_cogl_clip_state_restore_clip_stack (CoglClipState *clip_state)
|
|
{
|
|
CoglHandle stack;
|
|
|
|
_COGL_RETURN_IF_FAIL (clip_state->stacks != NULL);
|
|
|
|
stack = clip_state->stacks->data;
|
|
|
|
_cogl_clip_stack_unref (stack);
|
|
|
|
/* Revert to an old stack */
|
|
clip_state->stacks = g_slist_delete_link (clip_state->stacks,
|
|
clip_state->stacks);
|
|
}
|