efbf483d8c
Since most Clutter actors aren't much more than textured quads; flushing the journal typically involves lots of 'change modelview; draw quad' sequences. The amount of overhead involved in uploading a new modelview and queuing that primitive is huge in comparison to simply transforming 4 vertices by the current modelview when logging quads. (Note if your GPU supports HW vertex transform, then it still does the projective and viewport transforms) At the same time a --cogl-debug=disable-software-transform option has been added for comparison and debugging. This change allows typical pick scenes to be batched into a single draw call and I'm seeing test-pick run over 200% faster with this. (i965 + Mesa 7.6-devel)
132 lines
3.8 KiB
C
132 lines
3.8 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, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <glib/gi18n-lib.h>
|
|
|
|
#include "cogl-debug.h"
|
|
|
|
#ifdef COGL_ENABLE_DEBUG
|
|
static const GDebugKey cogl_debug_keys[] = {
|
|
{ "misc", COGL_DEBUG_MISC },
|
|
{ "texture", COGL_DEBUG_TEXTURE },
|
|
{ "material", COGL_DEBUG_MATERIAL },
|
|
{ "shader", COGL_DEBUG_SHADER },
|
|
{ "offscreen", COGL_DEBUG_OFFSCREEN },
|
|
{ "draw", COGL_DEBUG_DRAW },
|
|
{ "pango", COGL_DEBUG_PANGO },
|
|
{ "rectangles", COGL_DEBUG_RECTANGLES },
|
|
{ "handle", COGL_DEBUG_HANDLE },
|
|
{ "blend-strings", COGL_DEBUG_BLEND_STRINGS },
|
|
{ "disable-batching", COGL_DEBUG_DISABLE_BATCHING },
|
|
{ "client-side-matrices", COGL_DEBUG_FORCE_CLIENT_SIDE_MATRICES },
|
|
{ "disable-vbos", COGL_DEBUG_DISABLE_VBOS },
|
|
{ "journal", COGL_DEBUG_JOURNAL },
|
|
{ "batching", COGL_DEBUG_BATCHING },
|
|
{ "disable-software-transform", COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM }
|
|
};
|
|
|
|
static const gint n_cogl_debug_keys = G_N_ELEMENTS (cogl_debug_keys);
|
|
#endif /* COGL_ENABLE_DEBUG */
|
|
|
|
guint cogl_debug_flags = 0;
|
|
|
|
#ifdef COGL_ENABLE_DEBUG
|
|
static gboolean
|
|
cogl_arg_debug_cb (const char *key,
|
|
const char *value,
|
|
gpointer user_data)
|
|
{
|
|
cogl_debug_flags |=
|
|
g_parse_debug_string (value,
|
|
cogl_debug_keys,
|
|
n_cogl_debug_keys);
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
cogl_arg_no_debug_cb (const char *key,
|
|
const char *value,
|
|
gpointer user_data)
|
|
{
|
|
cogl_debug_flags &=
|
|
~g_parse_debug_string (value,
|
|
cogl_debug_keys,
|
|
n_cogl_debug_keys);
|
|
return TRUE;
|
|
}
|
|
#endif /* CLUTTER_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, },
|
|
};
|
|
|
|
static gboolean
|
|
pre_parse_hook (GOptionContext *context,
|
|
GOptionGroup *group,
|
|
gpointer data,
|
|
GError **error)
|
|
{
|
|
const char *env_string;
|
|
|
|
#ifdef COGL_ENABLE_DEBUG
|
|
env_string = g_getenv ("COGL_DEBUG");
|
|
if (env_string != NULL)
|
|
{
|
|
cogl_debug_flags =
|
|
g_parse_debug_string (env_string,
|
|
cogl_debug_keys,
|
|
n_cogl_debug_keys);
|
|
env_string = NULL;
|
|
}
|
|
#endif /* COGL_ENABLE_DEBUG */
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
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;
|
|
}
|