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

clutter: Add COGL_HAS_TRACING checks around tracing code

Browse Source 
This code sneaked unconditionally, even though we can disable
tracing code with -Dprofiler=false. Add some COGL_HAS_TRACING
checks so that this code is also optionally built.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1951>
This commit is contained in:
Carlos Garnacho 2021-08-02 17:14:02 +02:00
parent 6b1f49c153
commit a4c50ad123
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter/clutter-actor.c
View File

@ -3651,6 +3651,7 @@ clutter_actor_paint (ClutterActor *self,
if (!CLUTTER_ACTOR_IS_MAPPED (self)) if (!CLUTTER_ACTOR_IS_MAPPED (self))
return; return;
#ifdef COGL_HAS_TRACING
COGL_TRACE_SCOPED_ANCHOR (ClutterActorPaint); COGL_TRACE_SCOPED_ANCHOR (ClutterActorPaint);
if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE)) if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE))
@ -3660,6 +3661,7 @@ clutter_actor_paint (ClutterActor *self,
COGL_TRACE_DESCRIBE (ClutterActorPaint, COGL_TRACE_DESCRIBE (ClutterActorPaint,
_clutter_actor_get_debug_name (self)); _clutter_actor_get_debug_name (self));
} }
#endif
actor_node = clutter_actor_node_new (self, -1); actor_node = clutter_actor_node_new (self, -1);
root_node = clutter_paint_node_ref (actor_node); root_node = clutter_paint_node_ref (actor_node);
@ -9203,6 +9205,7 @@ clutter_actor_allocate (ClutterActor *self,
!clutter_actor_has_mapped_clones (self)) !clutter_actor_has_mapped_clones (self))
return; return;
#ifdef COGL_HAS_TRACING
COGL_TRACE_SCOPED_ANCHOR (ClutterActorAllocate); COGL_TRACE_SCOPED_ANCHOR (ClutterActorAllocate);
if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE)) if (G_UNLIKELY (clutter_debug_flags & CLUTTER_DEBUG_DETAILED_TRACE))
@ -9212,6 +9215,7 @@ clutter_actor_allocate (ClutterActor *self,
COGL_TRACE_DESCRIBE (ClutterActorAllocate, COGL_TRACE_DESCRIBE (ClutterActorAllocate,
_clutter_actor_get_debug_name (self)); _clutter_actor_get_debug_name (self));
} }
#endif
old_allocation = priv->allocation; old_allocation = priv->allocation;
real_allocation = *box; real_allocation = *box;