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>
116 lines
3.8 KiB
C
116 lines
3.8 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2007,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_JOURNAL_PRIVATE_H
|
|
#define __COGL_JOURNAL_PRIVATE_H
|
|
|
|
#include "cogl-texture.h"
|
|
#include "cogl-handle.h"
|
|
#include "cogl-clip-stack.h"
|
|
|
|
#define COGL_JOURNAL_VBO_POOL_SIZE 8
|
|
|
|
typedef struct _CoglJournal
|
|
{
|
|
CoglObject _parent;
|
|
|
|
/* A pointer the framebuffer that is using this journal. This is
|
|
only valid when the journal is not empty. It *does* take a
|
|
reference on the framebuffer. Although this creates a circular
|
|
reference, the framebuffer has special code to handle the case
|
|
where the journal is the only thing holding a reference and it
|
|
will cause the journal to flush */
|
|
CoglFramebuffer *framebuffer;
|
|
|
|
GArray *entries;
|
|
GArray *vertices;
|
|
size_t needed_vbo_len;
|
|
|
|
/* A pool of attribute buffers is used so that we can avoid repeatedly
|
|
reallocating buffers. Only one of these buffers at a time will be
|
|
used by Cogl but we keep more than one alive anyway in case the
|
|
GL driver is internally using the buffer and it would have to
|
|
allocate a new one when we start writing to it */
|
|
CoglAttributeBuffer *vbo_pool[COGL_JOURNAL_VBO_POOL_SIZE];
|
|
/* The next vbo to use from the pool. We just cycle through them in
|
|
order */
|
|
unsigned int next_vbo_in_pool;
|
|
|
|
int fast_read_pixel_count;
|
|
|
|
} CoglJournal;
|
|
|
|
/* To improve batching of geometry when submitting vertices to OpenGL we
|
|
* log the texture rectangles we want to draw to a journal, so when we
|
|
* later flush the journal we aim to batch data, and gl draw calls. */
|
|
typedef struct _CoglJournalEntry
|
|
{
|
|
CoglPipeline *pipeline;
|
|
int n_layers;
|
|
CoglMatrix model_view;
|
|
CoglClipStack *clip_stack;
|
|
/* Offset into ctx->logged_vertices */
|
|
size_t array_offset;
|
|
/* XXX: These entries are pretty big now considering the padding in
|
|
* CoglPipelineFlushOptions and CoglMatrix, so we might need to optimize this
|
|
* later. */
|
|
} CoglJournalEntry;
|
|
|
|
CoglJournal *
|
|
_cogl_journal_new (void);
|
|
|
|
void
|
|
_cogl_journal_log_quad (CoglJournal *journal,
|
|
const float *position,
|
|
CoglPipeline *pipeline,
|
|
int n_layers,
|
|
CoglTexture *layer0_override_texture,
|
|
const float *tex_coords,
|
|
unsigned int tex_coords_len);
|
|
|
|
void
|
|
_cogl_journal_flush (CoglJournal *journal,
|
|
CoglFramebuffer *framebuffer);
|
|
|
|
void
|
|
_cogl_journal_discard (CoglJournal *journal);
|
|
|
|
gboolean
|
|
_cogl_journal_all_entries_within_bounds (CoglJournal *journal,
|
|
float clip_x0,
|
|
float clip_y0,
|
|
float clip_x1,
|
|
float clip_y1);
|
|
|
|
gboolean
|
|
_cogl_journal_try_read_pixel (CoglJournal *journal,
|
|
int x,
|
|
int y,
|
|
CoglBitmap *bitmap,
|
|
gboolean *found_intersection);
|
|
|
|
gboolean
|
|
_cogl_is_journal (void *object);
|
|
|
|
#endif /* __COGL_JOURNAL_PRIVATE_H */
|