[mutter/wip/garnacho/wayland-emulated-output-transform: 22/30] backends: Use clutter_stage_view_get_onscreen() on native stage/view
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/garnacho/wayland-emulated-output-transform: 22/30] backends: Use clutter_stage_view_get_onscreen() on native stage/view
- Date: Mon, 8 Aug 2016 11:21:42 +0000 (UTC)
commit d0de9fc4979b38d6b94ebf483a9c9f34410e47e1
Author: Carlos Garnacho <carlosg gnome org>
Date: Sat Aug 6 19:43:43 2016 +0200
backends: Use clutter_stage_view_get_onscreen() on native stage/view
All their relevant calls affect onscreen data, so we should ensure we
get that framebuffer.
src/backends/native/meta-renderer-native.c | 8 ++++----
src/backends/native/meta-stage-native.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index 895f850..bdcfc79 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -379,7 +379,7 @@ on_crtc_flipped (GClosure *closure,
{
ClutterStageView *stage_view = CLUTTER_STAGE_VIEW (view);
CoglFramebuffer *framebuffer =
- clutter_stage_view_get_framebuffer (stage_view);
+ clutter_stage_view_get_onscreen (stage_view);
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
@@ -397,7 +397,7 @@ flip_closure_destroyed (MetaRendererView *view)
{
ClutterStageView *stage_view = CLUTTER_STAGE_VIEW (view);
CoglFramebuffer *framebuffer =
- clutter_stage_view_get_framebuffer (stage_view);
+ clutter_stage_view_get_onscreen (stage_view);
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
@@ -828,7 +828,7 @@ meta_renderer_native_queue_modes_reset (MetaRendererNative *renderer_native)
{
ClutterStageView *stage_view = l->data;
CoglFramebuffer *framebuffer =
- clutter_stage_view_get_framebuffer (stage_view);
+ clutter_stage_view_get_onscreen (stage_view);
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
@@ -861,7 +861,7 @@ meta_renderer_native_set_legacy_view_size (MetaRendererNative *renderer_native,
MetaMonitorManagerKms *monitor_manager_kms =
META_MONITOR_MANAGER_KMS (monitor_manager);
CoglFramebuffer *framebuffer =
- clutter_stage_view_get_framebuffer (stage_view);
+ clutter_stage_view_get_onscreen (stage_view);
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
diff --git a/src/backends/native/meta-stage-native.c b/src/backends/native/meta-stage-native.c
index 617a707..82ede47 100644
--- a/src/backends/native/meta-stage-native.c
+++ b/src/backends/native/meta-stage-native.c
@@ -127,7 +127,7 @@ ensure_frame_callback (MetaStageNative *stage_native,
if (closure)
return;
- framebuffer = clutter_stage_view_get_framebuffer (stage_view);
+ framebuffer = clutter_stage_view_get_onscreen (stage_view);
onscreen = COGL_ONSCREEN (framebuffer);
closure = cogl_onscreen_add_frame_callback (onscreen,
frame_cb,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]