mirror of
https://github.com/brl/mutter.git
synced 2024-12-26 12:52: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>
159 lines
4.8 KiB
C
159 lines
4.8 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/>.
|
|
*
|
|
*
|
|
*
|
|
* Authors:
|
|
* Robert Bragg <robert@linux.intel.com>
|
|
*/
|
|
|
|
#ifndef __COGL_VERTEX_BUFFER_H
|
|
#define __COGL_VERTEX_BUFFER_H
|
|
|
|
#include "cogl-handle.h"
|
|
|
|
#include "cogl-primitive.h"
|
|
|
|
#include <glib.h>
|
|
|
|
/* Note we put quite a bit into the flags here to help keep
|
|
* the down size of the CoglVertexBufferAttrib struct below. */
|
|
typedef enum _CoglVertexBufferAttribFlags
|
|
{
|
|
/* Types */
|
|
/* NB: update the _TYPE_MASK below if these are changed */
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_COLOR_ARRAY = 1<<0,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_NORMAL_ARRAY = 1<<1,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_TEXTURE_COORD_ARRAY = 1<<2,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_VERTEX_ARRAY = 1<<3,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_CUSTOM_ARRAY = 1<<4,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_INVALID = 1<<5,
|
|
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_NORMALIZED = 1<<6,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_ENABLED = 1<<7,
|
|
|
|
/* Usage hints */
|
|
/* FIXME - flatten into one flag, since its used as a boolean */
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_INFREQUENT_RESUBMIT = 1<<8,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_FREQUENT_RESUBMIT = 1<<9,
|
|
|
|
/* GL Data types */
|
|
/* NB: Update the _GL_TYPE_MASK below if these are changed */
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_BYTE = 1<<10,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_BYTE = 1<<11,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_SHORT = 1<<12,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_SHORT = 1<<13,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_INT = 1<<14,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_INT = 1<<15,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_FLOAT = 1<<16,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_DOUBLE = 1<<17,
|
|
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_SUBMITTED = 1<<18,
|
|
COGL_VERTEX_BUFFER_ATTRIB_FLAG_UNUSED = 1<<19
|
|
|
|
/* XXX NB: If we need > 24 bits then look at changing the layout
|
|
* of struct _CoglVertexBufferAttrib below */
|
|
} CoglVertexBufferAttribFlags;
|
|
|
|
#define COGL_VERTEX_BUFFER_ATTRIB_FLAG_TYPE_MASK \
|
|
(COGL_VERTEX_BUFFER_ATTRIB_FLAG_COLOR_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_NORMAL_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_TEXTURE_COORD_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_VERTEX_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_CUSTOM_ARRAY \
|
|
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_INVALID)
|
|
|
|
typedef struct _CoglVertexBufferAttrib
|
|
{
|
|
/* TODO: look at breaking up the flags into seperate
|
|
* bitfields and seperate enums */
|
|
CoglVertexBufferAttribFlags flags:24;
|
|
guint8 id;
|
|
GQuark name;
|
|
char *name_without_detail;
|
|
union _u
|
|
{
|
|
const void *pointer;
|
|
size_t vbo_offset;
|
|
} u;
|
|
CoglAttributeType type;
|
|
size_t span_bytes;
|
|
guint16 stride;
|
|
guint8 n_components;
|
|
guint8 texture_unit;
|
|
|
|
int attribute_first;
|
|
CoglAttribute *attribute;
|
|
|
|
} CoglVertexBufferAttrib;
|
|
|
|
typedef enum _CoglVertexBufferVBOFlags
|
|
{
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_STRIDED = 1<<0,
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_MULTIPACK = 1<<1,
|
|
|
|
/* FIXME - flatten into one flag, since its used as a boolean */
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_INFREQUENT_RESUBMIT = 1<<3,
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_FREQUENT_RESUBMIT = 1<<4,
|
|
|
|
COGL_VERTEX_BUFFER_VBO_FLAG_SUBMITTED = 1<<5
|
|
} CoglVertexBufferVBOFlags;
|
|
|
|
/*
|
|
* A CoglVertexBufferVBO represents one or more attributes in a single
|
|
* buffer object
|
|
*/
|
|
typedef struct _CoglVertexBufferVBO
|
|
{
|
|
CoglVertexBufferVBOFlags flags;
|
|
|
|
CoglAttributeBuffer *attribute_buffer;
|
|
size_t buffer_bytes;
|
|
|
|
GList *attributes;
|
|
} CoglVertexBufferVBO;
|
|
|
|
typedef struct _CoglVertexBufferIndices
|
|
{
|
|
CoglHandleObject _parent;
|
|
|
|
CoglIndices *indices;
|
|
} CoglVertexBufferIndices;
|
|
|
|
typedef struct _CoglVertexBuffer
|
|
{
|
|
CoglHandleObject _parent;
|
|
|
|
int n_vertices; /*!< The number of vertices in the buffer */
|
|
GList *submitted_vbos; /* The VBOs currently submitted to the GPU */
|
|
|
|
/* Note: new_attributes is normally NULL and only valid while
|
|
* modifying a buffer. */
|
|
GList *new_attributes; /*!< attributes pending submission */
|
|
|
|
gboolean dirty_attributes;
|
|
|
|
CoglPrimitive *primitive;
|
|
|
|
} CoglVertexBuffer;
|
|
|
|
#endif /* __COGL_VERTEX_BUFFER_H */
|
|
|