[mutter/gbsneto/charts] clutter/stage: Cast the stage just when needed
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/charts] clutter/stage: Cast the stage just when needed
- Date: Thu, 21 Mar 2019 17:49:07 +0000 (UTC)
commit 8291f79dbae053418452d19828ad6a818e7b973a
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu Mar 21 17:42:43 2019 +0000
clutter/stage: Cast the stage just when needed
If we use a variable, and the debug notes are disabled at
compile time, the variable becomes unused and we are warned.
Remove this variable and instead cast inline.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/502
clutter/clutter/clutter-stage.c | 5 ++---
clutter/clutter/cogl/clutter-stage-cogl.c | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index 8455917d3..a9d6c64a7 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1104,7 +1104,6 @@ _clutter_stage_maybe_relayout (ClutterActor *actor)
static void
clutter_stage_do_redraw (ClutterStage *stage)
{
- ClutterActor *actor = CLUTTER_ACTOR (stage);
ClutterStagePrivate *priv = stage->priv;
int64_t start;
int64_t end;
@@ -1116,7 +1115,7 @@ clutter_stage_do_redraw (ClutterStage *stage)
return;
CLUTTER_NOTE (PAINT, "Redraw started for stage '%s'[%p]",
- _clutter_actor_get_debug_name (actor),
+ _clutter_actor_get_debug_name (CLUTTER_ACTOR (stage)),
stage);
start = g_get_monotonic_time ();
@@ -1129,7 +1128,7 @@ clutter_stage_do_redraw (ClutterStage *stage)
CLUTTER_NOTE (FRAME_TIME, "%lf", priv->last_frame_time);
CLUTTER_NOTE (PAINT, "Redraw finished for stage '%s'[%p]",
- _clutter_actor_get_debug_name (actor),
+ _clutter_actor_get_debug_name (CLUTTER_ACTOR (stage)),
stage);
}
diff --git a/clutter/clutter/cogl/clutter-stage-cogl.c b/clutter/clutter/cogl/clutter-stage-cogl.c
index 84ef474b6..86bf4bb45 100644
--- a/clutter/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/clutter/cogl/clutter-stage-cogl.c
@@ -415,6 +415,7 @@ paint_frame_time_chart (ClutterStageWindow *stage_window,
CoglFramebuffer *framebuffer = clutter_stage_view_get_onscreen (view);
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
ClutterStageCogl *stage_cogl = CLUTTER_STAGE_COGL (stage_window);
+ ClutterActor *actor = CLUTTER_ACTOR (stage_cogl->wrapper);
static CoglPipeline *threshold_pipeline = NULL;
static CoglPipeline *paint_time_pipeline = NULL;
static GArray *frame_times = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]