mirror of
https://github.com/brl/mutter.git
synced 2024-11-10 07:56:14 -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>
287 lines
9.5 KiB
C
287 lines
9.5 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/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
#include <glib/gi18n-lib.h>
|
|
|
|
#include "cogl-private.h"
|
|
#include "cogl-debug.h"
|
|
#include "cogl1-context.h"
|
|
|
|
/* XXX: If you add a debug option, please also add an option
|
|
* definition to cogl-debug-options.h. This will enable us - for
|
|
* example - to emit a "help" description for the option.
|
|
*/
|
|
|
|
/* NB: Only these options get enabled if COGL_DEBUG=all is
|
|
* used since they don't affect the behaviour of Cogl they
|
|
* simply print out verbose information */
|
|
static const GDebugKey cogl_log_debug_keys[] = {
|
|
{ "handle", COGL_DEBUG_HANDLE },
|
|
{ "slicing", COGL_DEBUG_SLICING },
|
|
{ "atlas", COGL_DEBUG_ATLAS },
|
|
{ "blend-strings", COGL_DEBUG_BLEND_STRINGS },
|
|
{ "journal", COGL_DEBUG_JOURNAL },
|
|
{ "batching", COGL_DEBUG_BATCHING },
|
|
{ "matrices", COGL_DEBUG_MATRICES },
|
|
{ "draw", COGL_DEBUG_DRAW },
|
|
{ "opengl", COGL_DEBUG_OPENGL },
|
|
{ "pango", COGL_DEBUG_PANGO },
|
|
{ "show-source", COGL_DEBUG_SHOW_SOURCE},
|
|
{ "offscreen", COGL_DEBUG_OFFSCREEN },
|
|
{ "texture-pixmap", COGL_DEBUG_TEXTURE_PIXMAP },
|
|
{ "bitmap", COGL_DEBUG_BITMAP },
|
|
{ "clipping", COGL_DEBUG_CLIPPING },
|
|
{ "winsys", COGL_DEBUG_WINSYS }
|
|
};
|
|
static const int n_cogl_log_debug_keys =
|
|
G_N_ELEMENTS (cogl_log_debug_keys);
|
|
|
|
static const GDebugKey cogl_behavioural_debug_keys[] = {
|
|
{ "rectangles", COGL_DEBUG_RECTANGLES },
|
|
{ "disable-batching", COGL_DEBUG_DISABLE_BATCHING },
|
|
{ "disable-vbos", COGL_DEBUG_DISABLE_VBOS },
|
|
{ "disable-pbos", COGL_DEBUG_DISABLE_PBOS },
|
|
{ "disable-software-transform", COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM },
|
|
{ "dump-atlas-image", COGL_DEBUG_DUMP_ATLAS_IMAGE },
|
|
{ "disable-atlas", COGL_DEBUG_DISABLE_ATLAS },
|
|
{ "disable-shared-atlas", COGL_DEBUG_DISABLE_SHARED_ATLAS },
|
|
{ "disable-texturing", COGL_DEBUG_DISABLE_TEXTURING},
|
|
{ "disable-arbfp", COGL_DEBUG_DISABLE_ARBFP},
|
|
{ "disable-fixed", COGL_DEBUG_DISABLE_FIXED},
|
|
{ "disable-glsl", COGL_DEBUG_DISABLE_GLSL},
|
|
{ "disable-blending", COGL_DEBUG_DISABLE_BLENDING},
|
|
{ "disable-npot-textures", COGL_DEBUG_DISABLE_NPOT_TEXTURES},
|
|
{ "wireframe", COGL_DEBUG_WIREFRAME},
|
|
{ "disable-software-clip", COGL_DEBUG_DISABLE_SOFTWARE_CLIP},
|
|
{ "disable-program-caches", COGL_DEBUG_DISABLE_PROGRAM_CACHES},
|
|
{ "disable-fast-read-pixel", COGL_DEBUG_DISABLE_FAST_READ_PIXEL}
|
|
};
|
|
static const int n_cogl_behavioural_debug_keys =
|
|
G_N_ELEMENTS (cogl_behavioural_debug_keys);
|
|
|
|
unsigned long _cogl_debug_flags[COGL_DEBUG_N_LONGS];
|
|
GHashTable *_cogl_debug_instances;
|
|
|
|
static void
|
|
_cogl_parse_debug_string_for_keys (const char *value,
|
|
gboolean enable,
|
|
const GDebugKey *keys,
|
|
unsigned int nkeys)
|
|
{
|
|
int long_num, key_num;
|
|
|
|
/* g_parse_debug_string expects the value field in GDebugKey to be a
|
|
mask in a guint but the flags is stored in an array of multiple
|
|
longs so we need to build a separate array for each possible
|
|
guint */
|
|
|
|
for (long_num = 0; long_num < COGL_DEBUG_N_LONGS; long_num++)
|
|
{
|
|
int int_num;
|
|
|
|
for (int_num = 0;
|
|
int_num < sizeof (unsigned long) / sizeof (unsigned int);
|
|
int_num++)
|
|
{
|
|
GDebugKey keys_for_int[sizeof (unsigned int) * 8];
|
|
int nkeys_for_int = 0;
|
|
|
|
for (key_num = 0; key_num < nkeys; key_num++)
|
|
{
|
|
int long_index = COGL_FLAGS_GET_INDEX (keys[key_num].value);
|
|
int int_index = (keys[key_num].value %
|
|
(sizeof (unsigned long) * 8) /
|
|
(sizeof (unsigned int) * 8));
|
|
|
|
if (long_index == long_num && int_index == int_num)
|
|
{
|
|
keys_for_int[nkeys_for_int] = keys[key_num];
|
|
keys_for_int[nkeys_for_int].value =
|
|
COGL_FLAGS_GET_MASK (keys[key_num].value) >>
|
|
(int_num * sizeof (unsigned int) * 8);
|
|
nkeys_for_int++;
|
|
}
|
|
}
|
|
|
|
if (nkeys_for_int > 0)
|
|
{
|
|
unsigned long mask =
|
|
((unsigned long) g_parse_debug_string (value,
|
|
keys_for_int,
|
|
nkeys_for_int)) <<
|
|
(int_num * sizeof (unsigned int) * 8);
|
|
|
|
if (enable)
|
|
_cogl_debug_flags[long_num] |= mask;
|
|
else
|
|
_cogl_debug_flags[long_num] &= ~mask;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
_cogl_parse_debug_string (const char *value,
|
|
gboolean enable,
|
|
gboolean ignore_help)
|
|
{
|
|
if (ignore_help && strcmp (value, "help") == 0)
|
|
return;
|
|
|
|
/* We don't want to let g_parse_debug_string handle "all" because
|
|
* literally enabling all the debug options wouldn't be useful to
|
|
* anyone; instead the all option enables all non behavioural
|
|
* options.
|
|
*/
|
|
if (strcmp (value, "all") == 0 ||
|
|
strcmp (value, "verbose") == 0)
|
|
{
|
|
int i;
|
|
for (i = 0; i < n_cogl_log_debug_keys; i++)
|
|
if (enable)
|
|
COGL_DEBUG_SET_FLAG (cogl_log_debug_keys[i].value);
|
|
else
|
|
COGL_DEBUG_CLEAR_FLAG (cogl_log_debug_keys[i].value);
|
|
}
|
|
else if (g_ascii_strcasecmp (value, "help") == 0)
|
|
{
|
|
g_printerr ("\n\n%28s\n", _("Supported debug values:"));
|
|
#define OPT(MASK_NAME, GROUP, NAME, NAME_FORMATTED, DESCRIPTION) \
|
|
g_printerr ("%28s %s\n", NAME ":", g_dgettext (GETTEXT_PACKAGE, \
|
|
DESCRIPTION));
|
|
#include "cogl-debug-options.h"
|
|
g_printerr ("\n%28s\n", _("Special debug values:"));
|
|
OPT (IGNORED, "ignored", "all", "ignored", \
|
|
N_("Enables all non-behavioural debug options"));
|
|
OPT (IGNORED, "ignored", "verbose", "ignored", \
|
|
N_("Enables all non-behavioural debug options"));
|
|
#undef OPT
|
|
exit (1);
|
|
}
|
|
else
|
|
{
|
|
_cogl_parse_debug_string_for_keys (value,
|
|
enable,
|
|
cogl_log_debug_keys,
|
|
n_cogl_log_debug_keys);
|
|
_cogl_parse_debug_string_for_keys (value,
|
|
enable,
|
|
cogl_behavioural_debug_keys,
|
|
n_cogl_behavioural_debug_keys);
|
|
}
|
|
}
|
|
|
|
#ifdef COGL_ENABLE_DEBUG
|
|
static gboolean
|
|
cogl_arg_debug_cb (const char *key,
|
|
const char *value,
|
|
gpointer user_data)
|
|
{
|
|
_cogl_parse_debug_string (value,
|
|
TRUE /* enable the flags */,
|
|
FALSE /* don't ignore help */);
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
cogl_arg_no_debug_cb (const char *key,
|
|
const char *value,
|
|
gpointer user_data)
|
|
{
|
|
_cogl_parse_debug_string (value,
|
|
FALSE, /* disable the flags */
|
|
TRUE /* ignore help */);
|
|
return TRUE;
|
|
}
|
|
#endif /* COGL_ENABLE_DEBUG */
|
|
|
|
static GOptionEntry cogl_args[] = {
|
|
#ifdef COGL_ENABLE_DEBUG
|
|
{ "cogl-debug", 0, 0, G_OPTION_ARG_CALLBACK, cogl_arg_debug_cb,
|
|
N_("Cogl debugging flags to set"), "FLAGS" },
|
|
{ "cogl-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, cogl_arg_no_debug_cb,
|
|
N_("Cogl debugging flags to unset"), "FLAGS" },
|
|
#endif /* COGL_ENABLE_DEBUG */
|
|
{ NULL, },
|
|
};
|
|
|
|
void
|
|
_cogl_debug_check_environment (void)
|
|
{
|
|
const char *env_string;
|
|
|
|
env_string = g_getenv ("COGL_DEBUG");
|
|
if (env_string != NULL)
|
|
{
|
|
_cogl_parse_debug_string (env_string,
|
|
TRUE /* enable the flags */,
|
|
FALSE /* don't ignore help */);
|
|
env_string = NULL;
|
|
}
|
|
|
|
env_string = g_getenv ("COGL_NO_DEBUG");
|
|
if (env_string != NULL)
|
|
{
|
|
_cogl_parse_debug_string (env_string,
|
|
FALSE /* disable the flags */,
|
|
FALSE /* don't ignore help */);
|
|
env_string = NULL;
|
|
}
|
|
}
|
|
|
|
static gboolean
|
|
pre_parse_hook (GOptionContext *context,
|
|
GOptionGroup *group,
|
|
gpointer data,
|
|
GError **error)
|
|
{
|
|
_cogl_init ();
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/* XXX: GOption based library initialization is not reliable because the
|
|
* GOption API has no way to represent dependencies between libraries.
|
|
*/
|
|
GOptionGroup *
|
|
cogl_get_option_group (void)
|
|
{
|
|
GOptionGroup *group;
|
|
|
|
group = g_option_group_new ("cogl",
|
|
_("Cogl Options"),
|
|
_("Show Cogl options"),
|
|
NULL, NULL);
|
|
|
|
g_option_group_set_parse_hooks (group, pre_parse_hook, NULL);
|
|
g_option_group_add_entries (group, cogl_args);
|
|
g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
|
|
|
|
return group;
|
|
}
|