diff options
author | Benjamin Otte <otte@redhat.com> | 2017-12-03 21:56:24 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2017-12-03 21:57:21 +0100 |
commit | 52b1cd40d1f2b7e9c3227dc48f202b95320c9074 (patch) | |
tree | fa29cf0dfa9ad1faf9e1ca5fdc9b6470f5eb5d58 | |
parent | 794a2bfd0087614b1a6b07c314cde7bbefba77f3 (diff) | |
download | gtk+-52b1cd40d1f2b7e9c3227dc48f202b95320c9074.tar.gz |
gsk: Remove gsk_render_node_set_scaling_filters()
This is a leftover from the very early rendernode that we forgot to delete.
This can be seen by the fact that it is settable on an immutable object.
-rw-r--r-- | docs/reference/gsk/gsk4-sections.txt | 1 | ||||
-rw-r--r-- | gsk/gskglrenderer.c | 35 | ||||
-rw-r--r-- | gsk/gskrendernode.c | 27 | ||||
-rw-r--r-- | gsk/gskrendernode.h | 5 | ||||
-rw-r--r-- | gsk/gskrendernodeprivate.h | 4 |
5 files changed, 2 insertions, 70 deletions
diff --git a/docs/reference/gsk/gsk4-sections.txt b/docs/reference/gsk/gsk4-sections.txt index 36054757b4..b189478039 100644 --- a/docs/reference/gsk/gsk4-sections.txt +++ b/docs/reference/gsk/gsk4-sections.txt @@ -35,7 +35,6 @@ gsk_render_node_serialize gsk_render_node_deserialize gsk_render_node_write_to_file GskScalingFilter -gsk_render_node_set_scaling_filters gsk_render_node_set_name gsk_render_node_get_name gsk_render_node_get_bounds diff --git a/gsk/gskglrenderer.c b/gsk/gskglrenderer.c index 5b7a585710..88afdfdbe8 100644 --- a/gsk/gskglrenderer.c +++ b/gsk/gskglrenderer.c @@ -650,39 +650,8 @@ get_gl_scaling_filters (GskRenderNode *node, int *min_filter_r, int *mag_filter_r) { - switch (node->min_filter) - { - case GSK_SCALING_FILTER_NEAREST: - *min_filter_r = GL_NEAREST; - break; - - case GSK_SCALING_FILTER_LINEAR: - *min_filter_r = GL_LINEAR; - break; - - case GSK_SCALING_FILTER_TRILINEAR: - *min_filter_r = GL_LINEAR_MIPMAP_LINEAR; - break; - - default: - break; - } - - switch (node->mag_filter) - { - case GSK_SCALING_FILTER_NEAREST: - *mag_filter_r = GL_NEAREST; - break; - - /* There's no point in using anything above GL_LINEAR for - * magnification filters - */ - case GSK_SCALING_FILTER_LINEAR: - case GSK_SCALING_FILTER_TRILINEAR: - default: - *mag_filter_r = GL_LINEAR; - break; - } + *min_filter_r = GL_NEAREST; + *mag_filter_r = GL_NEAREST; } #if 0 diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c index 9cccce763b..0dc0e7628c 100644 --- a/gsk/gskrendernode.c +++ b/gsk/gskrendernode.c @@ -93,9 +93,6 @@ gsk_render_node_new (const GskRenderNodeClass *node_class, gsize extra_size) self->ref_count = 1; - self->min_filter = GSK_SCALING_FILTER_NEAREST; - self->mag_filter = GSK_SCALING_FILTER_NEAREST; - return self; } @@ -178,30 +175,6 @@ gsk_render_node_get_bounds (GskRenderNode *node, } /** - * gsk_render_node_set_scaling_filters: - * @node: a #GskRenderNode - * @min_filter: the filter for scaling down - * @mag_filter: the filter for scaling up - * - * Sets filters to be used when a node must be scaled up - * or down. - * - * Since: 3.90 - */ -void -gsk_render_node_set_scaling_filters (GskRenderNode *node, - GskScalingFilter min_filter, - GskScalingFilter mag_filter) -{ - g_return_if_fail (GSK_IS_RENDER_NODE (node)); - - if (node->min_filter != min_filter) - node->min_filter = min_filter; - if (node->mag_filter != mag_filter) - node->mag_filter = mag_filter; -} - -/** * gsk_render_node_set_name: * @node: a #GskRenderNode * @name: (nullable): a name for the node diff --git a/gsk/gskrendernode.h b/gsk/gskrendernode.h index 567f595268..6da3b71c3a 100644 --- a/gsk/gskrendernode.h +++ b/gsk/gskrendernode.h @@ -67,11 +67,6 @@ GDK_AVAILABLE_IN_3_90 GskRenderNodeType gsk_render_node_get_node_type (GskRenderNode *node); GDK_AVAILABLE_IN_3_90 -void gsk_render_node_set_scaling_filters (GskRenderNode *node, - GskScalingFilter min_filter, - GskScalingFilter mag_filter); - -GDK_AVAILABLE_IN_3_90 void gsk_render_node_set_name (GskRenderNode *node, const char *name); GDK_AVAILABLE_IN_3_90 diff --git a/gsk/gskrendernodeprivate.h b/gsk/gskrendernodeprivate.h index e337c53656..dad1703e0b 100644 --- a/gsk/gskrendernodeprivate.h +++ b/gsk/gskrendernodeprivate.h @@ -19,10 +19,6 @@ struct _GskRenderNode /* Use for debugging */ char *name; - /* Scaling filters */ - GskScalingFilter min_filter; - GskScalingFilter mag_filter; - graphene_rect_t bounds; }; |