mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 00:20:42 -05: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>
81 lines
2.6 KiB
C
81 lines
2.6 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 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_ATLAS_TEXTURE_H
|
|
#define __COGL_ATLAS_TEXTURE_H
|
|
|
|
#include "cogl-handle.h"
|
|
#include "cogl-texture-private.h"
|
|
#include "cogl-rectangle-map.h"
|
|
#include "cogl-atlas.h"
|
|
|
|
#define COGL_ATLAS_TEXTURE(tex) ((CoglAtlasTexture *) tex)
|
|
|
|
typedef struct _CoglAtlasTexture CoglAtlasTexture;
|
|
|
|
struct _CoglAtlasTexture
|
|
{
|
|
CoglTexture _parent;
|
|
|
|
/* The format that the texture is in. This isn't necessarily the
|
|
same format as the atlas texture because we can store
|
|
pre-multiplied and non-pre-multiplied textures together */
|
|
CoglPixelFormat format;
|
|
|
|
/* The rectangle that was used to add this texture to the
|
|
atlas. This includes the 1-pixel border */
|
|
CoglRectangleMapEntry rectangle;
|
|
|
|
/* The atlas that this texture is in. If the texture is no longer in
|
|
an atlas then this will be NULL. A reference is taken on the
|
|
atlas by the texture (but not vice versa so there is no cycle) */
|
|
CoglAtlas *atlas;
|
|
|
|
/* A CoglSubTexture representing the region for easy rendering */
|
|
CoglHandle sub_texture;
|
|
};
|
|
|
|
CoglHandle
|
|
_cogl_atlas_texture_new_from_bitmap (CoglBitmap *bmp,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format);
|
|
|
|
CoglHandle
|
|
_cogl_atlas_texture_new_with_size (unsigned int width,
|
|
unsigned int height,
|
|
CoglTextureFlags flags,
|
|
CoglPixelFormat internal_format);
|
|
|
|
void
|
|
_cogl_atlas_texture_add_reorganize_callback (GHookFunc callback,
|
|
void *user_data);
|
|
|
|
void
|
|
_cogl_atlas_texture_remove_reorganize_callback (GHookFunc callback,
|
|
void *user_data);
|
|
|
|
gboolean
|
|
_cogl_is_atlas_texture (void *object);
|
|
|
|
#endif /* __COGL_ATLAS_TEXTURE_H */
|