[mutter/gbsneto/graphene-ray: 3/4] clutter/pick-context: Remove clutter_pick_context_get_framebuffer()
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/graphene-ray: 3/4] clutter/pick-context: Remove clutter_pick_context_get_framebuffer()
- Date: Mon, 26 Oct 2020 13:19:16 +0000 (UTC)
commit ce6f13357af3a2a87d32b64348b36f51f615eb72
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat Oct 17 13:18:37 2020 -0300
clutter/pick-context: Remove clutter_pick_context_get_framebuffer()
It is not used anymore.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1509
clutter/clutter/clutter-pick-context.c | 16 ++--------------
clutter/clutter/clutter-pick-context.h | 3 ---
2 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/clutter/clutter/clutter-pick-context.c b/clutter/clutter/clutter-pick-context.c
index 7348ec57c6..4e6fb7a882 100644
--- a/clutter/clutter/clutter-pick-context.c
+++ b/clutter/clutter/clutter-pick-context.c
@@ -17,6 +17,7 @@
#include "clutter-build-config.h"
+#include "clutter-backend.h"
#include "clutter-pick-context-private.h"
struct _ClutterPickContext
@@ -24,7 +25,6 @@ struct _ClutterPickContext
grefcount ref_count;
ClutterPickMode mode;
- CoglFramebuffer *framebuffer;
ClutterPickStack *pick_stack;
};
@@ -42,10 +42,8 @@ clutter_pick_context_new_for_view (ClutterStageView *view,
pick_context = g_new0 (ClutterPickContext, 1);
g_ref_count_init (&pick_context->ref_count);
pick_context->mode = mode;
- pick_context->framebuffer =
- g_object_ref (clutter_stage_view_get_framebuffer (view));
- context = cogl_framebuffer_get_context (pick_context->framebuffer);
+ context = clutter_backend_get_cogl_context (clutter_get_default_backend ());
pick_context->pick_stack = clutter_pick_stack_new (context);
return pick_context;
@@ -62,7 +60,6 @@ static void
clutter_pick_context_dispose (ClutterPickContext *pick_context)
{
g_clear_pointer (&pick_context->pick_stack, clutter_pick_stack_unref);
- g_clear_object (&pick_context->framebuffer);
}
void
@@ -82,15 +79,6 @@ clutter_pick_context_destroy (ClutterPickContext *pick_context)
clutter_pick_context_unref (pick_context);
}
-/**
- * clutter_pick_context_get_framebuffer: (skip)
- */
-CoglFramebuffer *
-clutter_pick_context_get_framebuffer (ClutterPickContext *pick_context)
-{
- return pick_context->framebuffer;
-}
-
/**
* clutter_pick_context_get_mode: (skip)
*/
diff --git a/clutter/clutter/clutter-pick-context.h b/clutter/clutter/clutter-pick-context.h
index 0faf028256..5792be6b58 100644
--- a/clutter/clutter/clutter-pick-context.h
+++ b/clutter/clutter/clutter-pick-context.h
@@ -43,9 +43,6 @@ void clutter_pick_context_unref (ClutterPickContext *pick_context);
CLUTTER_EXPORT
void clutter_pick_context_destroy (ClutterPickContext *pick_context);
-CLUTTER_EXPORT
-CoglFramebuffer * clutter_pick_context_get_framebuffer (ClutterPickContext *pick_context);
-
CLUTTER_EXPORT
ClutterPickMode clutter_pick_context_get_mode (ClutterPickContext *pick_context);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]