From 24f615cad13be5cc2f5f6672ae3728178092e7cc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 19 Apr 2023 09:19:12 +0200 Subject: [PATCH] gsk: Use explicit switches This makes it harder to forget to add new node types here. --- gsk/gl/gskglrenderjob.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/gsk/gl/gskglrenderjob.c b/gsk/gl/gskglrenderjob.c index ec3e612f30..9aa5123cdc 100644 --- a/gsk/gl/gskglrenderjob.c +++ b/gsk/gl/gskglrenderjob.c @@ -254,7 +254,7 @@ gsk_rounded_rect_shrink_to_minimum (GskRoundedRect *self) static inline gboolean G_GNUC_PURE node_supports_2d_transform (const GskRenderNode *node) { - switch ((int)gsk_render_node_get_node_type (node)) + switch (gsk_render_node_get_node_type (node)) { case GSK_COLOR_NODE: case GSK_OPACITY_NODE: @@ -289,8 +289,18 @@ node_supports_2d_transform (const GskRenderNode *node) } return TRUE; - default: + case GSK_BORDER_NODE: + case GSK_INSET_SHADOW_NODE: + case GSK_OUTSET_SHADOW_NODE: + case GSK_REPEAT_NODE: + case GSK_CLIP_NODE: + case GSK_ROUNDED_CLIP_NODE: + case GSK_GL_SHADER_NODE: return FALSE; + + case GSK_NOT_A_RENDER_NODE: + default: + g_assert_not_reached (); } } @@ -304,7 +314,7 @@ node_supports_transform (const GskRenderNode *node) * opacity or color matrix. */ - switch ((int)gsk_render_node_get_node_type (node)) + switch (gsk_render_node_get_node_type (node)) { case GSK_COLOR_NODE: case GSK_OPACITY_NODE: @@ -325,8 +335,25 @@ node_supports_transform (const GskRenderNode *node) case GSK_TRANSFORM_NODE: return node_supports_transform (gsk_transform_node_get_child (node)); - default: + case GSK_CONTAINER_NODE: + case GSK_LINEAR_GRADIENT_NODE: + case GSK_REPEATING_LINEAR_GRADIENT_NODE: + case GSK_RADIAL_GRADIENT_NODE: + case GSK_REPEATING_RADIAL_GRADIENT_NODE: + case GSK_CONIC_GRADIENT_NODE: + case GSK_BORDER_NODE: + case GSK_INSET_SHADOW_NODE: + case GSK_OUTSET_SHADOW_NODE: + case GSK_REPEAT_NODE: + case GSK_CLIP_NODE: + case GSK_ROUNDED_CLIP_NODE: + case GSK_GL_SHADER_NODE: + case GSK_TEXTURE_SCALE_NODE: return FALSE; + + case GSK_NOT_A_RENDER_NODE: + default: + g_assert_not_reached (); } } -- 2.30.2