brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl debug: hint that all debugging paths are G_UNLIKELY

Browse Source 
Most Cogl debugging code conditions are marked as G_UNLIKELY with the
intention of having the CPU branch prediction always assume the
path is disabled so having debugging support in release binaries has
negligible overhead.

This patch simply fixes a few cases where we weren't using G_UNLIKELY.
This commit is contained in:
Robert Bragg 2010-02-17 17:53:28 +00:00
parent 210e618e6d
commit 5751e48756
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cogl/cogl-journal.c
View File

@ -126,7 +126,8 @@ _cogl_journal_dump_quad_vertices (guint8 *data, int n_layers)
guint8 *c = data + (POS_STRIDE * 4) + (i * stride * 4); guint8 *c = data + (POS_STRIDE * 4) + (i * stride * 4);
int j; int j;
if (cogl_debug_flags & COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM) if (G_UNLIKELY (cogl_debug_flags &
COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM))
g_print ("v%d: x = %f, y = %f, rgba=0x%02X%02X%02X%02X", g_print ("v%d: x = %f, y = %f, rgba=0x%02X%02X%02X%02X",
i, v[0], v[1], c[0], c[1], c[2], c[3]); i, v[0], v[1], c[0], c[1], c[2], c[3]);
else else
@ -234,7 +235,7 @@ _cogl_journal_flush_modelview_and_entries (CoglJournalEntry *batch_start,
* issues, visually seeing what is batched and debugging blending * issues, visually seeing what is batched and debugging blending
* issues, plus it looks quite cool. * issues, plus it looks quite cool.
*/ */
if (cogl_debug_flags & COGL_DEBUG_RECTANGLES) if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_RECTANGLES))
{ {
static CoglHandle outline = COGL_INVALID_HANDLE; static CoglHandle outline = COGL_INVALID_HANDLE;
guint8 color_intensity; guint8 color_intensity;
@ -331,7 +332,7 @@ _cogl_journal_flush_material_and_entries (CoglJournalEntry *batch_start,
/* If we haven't transformed the quads in software then we need to also break /* If we haven't transformed the quads in software then we need to also break
* up batches according to changes in the modelview matrix... */ * up batches according to changes in the modelview matrix... */
if (cogl_debug_flags & COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM) if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM))
{ {
batch_and_call (batch_start, batch_and_call (batch_start,
batch_len, batch_len,
@ -479,7 +480,7 @@ _cogl_journal_flush_vbo_offsets_and_entries (CoglJournalEntry *batch_start,
* VBO using a vertex offset passed to glDraw{Arrays,Elements} */ * VBO using a vertex offset passed to glDraw{Arrays,Elements} */
state->vertex_offset = 0; state->vertex_offset = 0;
if (cogl_debug_flags & COGL_DEBUG_JOURNAL) if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_JOURNAL))
{ {
guint8 *verts; guint8 *verts;

2
cogl/cogl.c
View File

@ -487,7 +487,7 @@ cogl_get_features (void)
{ {
_COGL_GET_CONTEXT (ctx, 0); _COGL_GET_CONTEXT (ctx, 0);
if (cogl_debug_flags & COGL_DEBUG_DISABLE_VBOS) if (G_UNLIKELY (cogl_debug_flags & COGL_DEBUG_DISABLE_VBOS))
ctx->feature_flags &= ~COGL_FEATURE_VBOS; ctx->feature_flags &= ~COGL_FEATURE_VBOS;
return ctx->feature_flags; return ctx->feature_flags;