mirror of
https://github.com/brl/mutter.git
synced 2024-12-26 04:42: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>
144 lines
3.7 KiB
C
144 lines
3.7 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2008,2009 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/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifndef __COGL_H__
|
|
#define __COGL_H__
|
|
|
|
#include <glib.h>
|
|
|
|
#define __COGL_H_INSIDE__
|
|
|
|
#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
|
|
#ifndef COGL_ENABLE_EXPERIMENTAL_API
|
|
#define COGL_ENABLE_EXPERIMENTAL_API
|
|
#endif
|
|
#endif
|
|
|
|
/* We currently keep gtype integration delimited in case we eventually
|
|
* want to split it out into a separate utility library when Cogl
|
|
* becomes a standalone project. (like cairo-gobject.so)
|
|
*/
|
|
#define _COGL_SUPPORTS_GTYPE_INTEGRATION
|
|
|
|
/*
|
|
* API common to the 1.x and 2.0 api...
|
|
*/
|
|
|
|
#include <cogl/cogl-defines.h>
|
|
|
|
#include <cogl/cogl-object.h>
|
|
#include <cogl/cogl1-context.h>
|
|
#include <cogl/cogl-bitmap.h>
|
|
#include <cogl/cogl-color.h>
|
|
#include <cogl/cogl-matrix.h>
|
|
#include <cogl/cogl-offscreen.h>
|
|
#include <cogl/cogl-primitives.h>
|
|
#include <cogl/cogl-texture.h>
|
|
#include <cogl/cogl-types.h>
|
|
|
|
/*
|
|
* 1.x only api...
|
|
*/
|
|
#ifndef COGL_ENABLE_EXPERIMENTAL_2_0_API
|
|
#include <cogl/cogl-path.h>
|
|
#include <cogl/cogl-clip-state.h>
|
|
#include <cogl/cogl-vertex-buffer.h>
|
|
#include <cogl/cogl-enum-types.h>
|
|
#include <cogl/cogl-fixed.h>
|
|
#include <cogl/cogl-material-compat.h>
|
|
#include <cogl/cogl-shader.h>
|
|
#endif
|
|
|
|
/*
|
|
* 2.0 api that's compatible with the 1.x api...
|
|
*/
|
|
#if defined (COGL_ENABLE_EXPERIMENTAL_API)
|
|
#include <cogl/cogl-swap-chain.h>
|
|
#include <cogl/cogl-renderer.h>
|
|
#include <cogl/cogl-display.h>
|
|
#include <cogl/cogl-context.h>
|
|
#include <cogl/cogl-buffer.h>
|
|
#include <cogl/cogl-pixel-buffer.h>
|
|
#include <cogl/cogl-vector.h>
|
|
#include <cogl/cogl-euler.h>
|
|
#include <cogl/cogl-quaternion.h>
|
|
#include <cogl/cogl-texture-2d.h>
|
|
#include <cogl/cogl-texture-rectangle.h>
|
|
#include <cogl/cogl-texture-3d.h>
|
|
#include <cogl/cogl-texture-2d-sliced.h>
|
|
#include <cogl/cogl-sub-texture.h>
|
|
#include <cogl/cogl-meta-texture.h>
|
|
#include <cogl/cogl-index-buffer.h>
|
|
#include <cogl/cogl-attribute-buffer.h>
|
|
#include <cogl/cogl-indices.h>
|
|
#include <cogl/cogl-attribute.h>
|
|
#include <cogl/cogl-primitive.h>
|
|
#include <cogl/cogl-depth-state.h>
|
|
#include <cogl/cogl-pipeline.h>
|
|
#include <cogl/cogl-pipeline-state.h>
|
|
#include <cogl/cogl-pipeline-layer-state.h>
|
|
#include <cogl/cogl-snippet.h>
|
|
#include <cogl/cogl-framebuffer.h>
|
|
#include <cogl/cogl-onscreen.h>
|
|
#include <cogl/cogl-poll.h>
|
|
#if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
|
|
#include <cogl/cogl-kms-renderer.h>
|
|
#endif
|
|
#if defined (COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT)
|
|
#include <cogl/cogl-wayland-renderer.h>
|
|
#endif
|
|
#if COGL_HAS_WIN32_SUPPORT
|
|
#include <cogl/cogl-win32-renderer.h>
|
|
#endif
|
|
#ifdef COGL_HAS_GLIB_SUPPORT
|
|
#include <cogl/cogl-glib-source.h>
|
|
#endif
|
|
/* XXX: This will definitly go away once all the Clutter winsys
|
|
* code has been migrated down into Cogl! */
|
|
#include <cogl/cogl-clutter.h>
|
|
#endif
|
|
|
|
/*
|
|
* 2.0 only api...
|
|
*/
|
|
#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
|
|
#include <cogl/cogl2-path.h>
|
|
#endif
|
|
|
|
/*
|
|
* API deprecations
|
|
*/
|
|
#include <cogl/cogl-deprecated.h>
|
|
|
|
/**
|
|
* SECTION:cogl
|
|
* @short_description: General purpose API
|
|
*
|
|
* General utility functions for COGL.
|
|
*/
|
|
|
|
#undef __COGL_H_INSIDE__
|
|
|
|
#endif /* __COGL_H__ */
|