[mutter/gbsneto/clutter-cleanups: 1/10] clutter/main: Remove shader stack
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/clutter-cleanups: 1/10] clutter/main: Remove shader stack
- Date: Mon, 1 Jul 2019 22:13:02 +0000 (UTC)
commit 5bd85ef7e5fee767d56b43d0d226d98ffcba7ad0
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sun Jun 30 16:43:00 2019 -0300
clutter/main: Remove shader stack
It is private to Clutter, and also unused by Clutter.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/666
clutter/clutter/clutter-main.c | 29 -----------------------------
clutter/clutter/clutter-private.h | 6 ------
2 files changed, 35 deletions(-)
---
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 6b776601a..ef0b7d289 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -3577,35 +3577,6 @@ _clutter_context_get_pick_mode (void)
return context->pick_mode;
}
-void
-_clutter_context_push_shader_stack (ClutterActor *actor)
-{
- ClutterMainContext *context = _clutter_context_get_default ();
-
- context->shaders = g_slist_prepend (context->shaders, actor);
-}
-
-ClutterActor *
-_clutter_context_peek_shader_stack (void)
-{
- ClutterMainContext *context = _clutter_context_get_default ();
-
- if (context->shaders != NULL)
- return context->shaders->data;
-
- return NULL;
-}
-
-ClutterActor *
-_clutter_context_pop_shader_stack (ClutterActor *actor)
-{
- ClutterMainContext *context = _clutter_context_get_default ();
-
- context->shaders = g_slist_remove (context->shaders, actor);
-
- return _clutter_context_peek_shader_stack ();
-}
-
gboolean
_clutter_context_get_motion_events_enabled (void)
{
diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h
index d4706808e..e20923a66 100644
--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -146,9 +146,6 @@ struct _ClutterMainContext
ClutterActor *pointer_grab_actor;
ClutterActor *keyboard_grab_actor;
- /* stack of actors with shaders during paint */
- GSList *shaders;
-
/* fb bit masks for col<->id mapping in picking */
gint fb_r_mask;
gint fb_g_mask;
@@ -198,9 +195,6 @@ void _clutter_context_lock (void);
void _clutter_context_unlock (void);
gboolean _clutter_context_is_initialized (void);
ClutterPickMode _clutter_context_get_pick_mode (void);
-void _clutter_context_push_shader_stack (ClutterActor *actor);
-ClutterActor * _clutter_context_pop_shader_stack (ClutterActor *actor);
-ClutterActor * _clutter_context_peek_shader_stack (void);
gboolean _clutter_context_get_motion_events_enabled (void);
gboolean _clutter_context_get_show_fps (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]