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>
112 lines
3.5 KiB
C
112 lines
3.5 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-object-private.h"
|
|
#include "cogl-indices.h"
|
|
#include "cogl-indices-private.h"
|
|
#include "cogl-context-private.h"
|
|
|
|
static void _cogl_index_buffer_free (CoglIndexBuffer *indices);
|
|
|
|
COGL_BUFFER_DEFINE (IndexBuffer, index_buffer);
|
|
|
|
/* XXX: Unlike the wiki design this just takes a size. A single
|
|
* indices buffer should be able to contain multiple ranges of indices
|
|
* which the wiki design doesn't currently consider. */
|
|
CoglIndexBuffer *
|
|
cogl_index_buffer_new (CoglContext *context, gsize bytes)
|
|
{
|
|
CoglIndexBuffer *indices = g_slice_new (CoglIndexBuffer);
|
|
gboolean use_malloc;
|
|
|
|
if (!(context->private_feature_flags & COGL_PRIVATE_FEATURE_VBOS))
|
|
use_malloc = TRUE;
|
|
else
|
|
use_malloc = FALSE;
|
|
|
|
/* parent's constructor */
|
|
_cogl_buffer_initialize (COGL_BUFFER (indices),
|
|
context,
|
|
bytes,
|
|
use_malloc,
|
|
COGL_BUFFER_BIND_TARGET_INDEX_BUFFER,
|
|
COGL_BUFFER_USAGE_HINT_INDEX_BUFFER,
|
|
COGL_BUFFER_UPDATE_HINT_STATIC);
|
|
|
|
return _cogl_index_buffer_object_new (indices);
|
|
}
|
|
|
|
static void
|
|
_cogl_index_buffer_free (CoglIndexBuffer *indices)
|
|
{
|
|
/* parent's destructor */
|
|
_cogl_buffer_fini (COGL_BUFFER (indices));
|
|
|
|
g_slice_free (CoglIndexBuffer, indices);
|
|
}
|
|
|
|
/* XXX: do we want a convenience function like this as an alternative
|
|
* to using cogl_buffer_set_data? The advantage of this is that we can
|
|
* track meta data such as the indices type and max_index_value for a
|
|
* range as part of the indices buffer. If we just leave people to use
|
|
* cogl_buffer_set_data then we either need a way to specify the type
|
|
* and max index value at draw time or we'll want a separate way to
|
|
* declare the type and max value for a range after uploading the
|
|
* data.
|
|
*
|
|
* XXX: I think in the end it'll be that CoglIndices are to
|
|
* CoglIndexBuffers as CoglAttributes are to CoglAttributeBuffers. I.e
|
|
* a CoglIndexBuffer is a lite subclass of CoglBuffer that simply
|
|
* implies that the buffer will later be bound as indices but doesn't
|
|
* track more detailed meta data. CoglIndices build on a
|
|
* CoglIndexBuffer and define the type and max_index_value for some
|
|
* sub-range of a CoglIndexBuffer.
|
|
*/
|
|
#if 0
|
|
void
|
|
cogl_index_buffer_set_data (CoglIndexBuffer *indices,
|
|
CoglIndicesType type,
|
|
int max_index_value,
|
|
gsize write_offset,
|
|
void *user_indices,
|
|
int n_indices)
|
|
{
|
|
GList *l;
|
|
|
|
for (l = indices->ranges; l; l = l->next)
|
|
{
|
|
|
|
}
|
|
cogl_buffer_set
|
|
}
|
|
#endif
|
|
|