mirror of
https://github.com/brl/mutter.git
synced 2024-09-20 06:25:51 -04: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>
162 lines
3.8 KiB
C
162 lines
3.8 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2011 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, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*
|
|
* Authors:
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <string.h>
|
|
|
|
#include "cogl-private.h"
|
|
#include "cogl-object.h"
|
|
#include "cogl-internal.h"
|
|
|
|
#include "cogl-display-private.h"
|
|
#include "cogl-renderer-private.h"
|
|
#include "cogl-winsys-private.h"
|
|
|
|
static void _cogl_display_free (CoglDisplay *display);
|
|
|
|
COGL_OBJECT_DEFINE (Display, display);
|
|
|
|
static const CoglWinsysVtable *
|
|
_cogl_display_get_winsys (CoglDisplay *display)
|
|
{
|
|
return display->renderer->winsys_vtable;
|
|
}
|
|
|
|
static void
|
|
_cogl_display_free (CoglDisplay *display)
|
|
{
|
|
const CoglWinsysVtable *winsys;
|
|
|
|
if (display->setup)
|
|
{
|
|
winsys = _cogl_display_get_winsys (display);
|
|
winsys->display_destroy (display);
|
|
display->setup = FALSE;
|
|
}
|
|
|
|
if (display->renderer)
|
|
{
|
|
cogl_object_unref (display->renderer);
|
|
display->renderer = NULL;
|
|
}
|
|
|
|
if (display->onscreen_template)
|
|
{
|
|
cogl_object_unref (display->onscreen_template);
|
|
display->onscreen_template = NULL;
|
|
}
|
|
|
|
g_slice_free (CoglDisplay, display);
|
|
}
|
|
|
|
CoglDisplay *
|
|
cogl_display_new (CoglRenderer *renderer,
|
|
CoglOnscreenTemplate *onscreen_template)
|
|
{
|
|
CoglDisplay *display = g_slice_new0 (CoglDisplay);
|
|
GError *error = NULL;
|
|
|
|
_cogl_init ();
|
|
|
|
display->renderer = renderer;
|
|
if (renderer)
|
|
cogl_object_ref (renderer);
|
|
else
|
|
display->renderer = cogl_renderer_new ();
|
|
|
|
if (!cogl_renderer_connect (display->renderer, &error))
|
|
{
|
|
g_warning ("Failed to connect renderer: %s\n", error->message);
|
|
g_error_free (error);
|
|
g_object_unref (display->renderer);
|
|
g_slice_free (CoglDisplay, display);
|
|
return NULL;
|
|
}
|
|
|
|
display->onscreen_template = onscreen_template;
|
|
if (onscreen_template)
|
|
cogl_object_ref (onscreen_template);
|
|
else
|
|
display->onscreen_template = cogl_onscreen_template_new (NULL);
|
|
|
|
display->setup = FALSE;
|
|
|
|
#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
|
|
display->gdl_plane = GDL_PLANE_ID_UPP_C;
|
|
#endif
|
|
|
|
return _cogl_display_object_new (display);
|
|
}
|
|
|
|
CoglRenderer *
|
|
cogl_display_get_renderer (CoglDisplay *display)
|
|
{
|
|
return display->renderer;
|
|
}
|
|
|
|
gboolean
|
|
cogl_display_setup (CoglDisplay *display,
|
|
GError **error)
|
|
{
|
|
const CoglWinsysVtable *winsys;
|
|
|
|
if (display->setup)
|
|
return TRUE;
|
|
|
|
winsys = _cogl_display_get_winsys (display);
|
|
if (!winsys->display_setup (display, error))
|
|
return FALSE;
|
|
|
|
display->setup = TRUE;
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
#ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT
|
|
void
|
|
cogl_gdl_display_set_plane (CoglDisplay *display,
|
|
gdl_plane_id_t plane)
|
|
{
|
|
_COGL_RETURN_IF_FAIL (display->setup == FALSE);
|
|
|
|
display->gdl_plane = plane;
|
|
}
|
|
#endif
|
|
|
|
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
|
|
void
|
|
cogl_wayland_display_set_compositor_display (CoglDisplay *display,
|
|
struct wl_display *wayland_display)
|
|
{
|
|
_COGL_RETURN_IF_FAIL (display->setup == FALSE);
|
|
|
|
display->wayland_compositor_display = wayland_display;
|
|
}
|
|
#endif
|