diff --git a/gdk/gdkcolorprivate.h b/gdk/gdkcolorprivate.h index cb4185b006..93369100a9 100644 --- a/gdk/gdkcolorprivate.h +++ b/gdk/gdkcolorprivate.h @@ -65,7 +65,7 @@ G_STATIC_ASSERT (G_STRUCT_OFFSET (GdkColor, b) == G_STRUCT_OFFSET (GdkColor, val G_STATIC_ASSERT (G_STRUCT_OFFSET (GdkColor, a) == G_STRUCT_OFFSET (GdkColor, values[3])); #endif -#define GDK_COLOR_INIT_SRGB(r,g,b,a) { \ +#define GDK_COLOR_SRGB(r,g,b,a) (GdkColor) { \ .color_state = GDK_COLOR_STATE_SRGB, \ .values = { (r), (g), (b), (a) } \ } diff --git a/gsk/gpu/gskgpunodeprocessor.c b/gsk/gpu/gskgpunodeprocessor.c index c281dc545b..2cdb7b5b7e 100644 --- a/gsk/gpu/gskgpunodeprocessor.c +++ b/gsk/gpu/gskgpunodeprocessor.c @@ -2521,16 +2521,13 @@ static void gsk_gpu_node_processor_add_gl_shader_node (GskGpuNodeProcessor *self, GskRenderNode *node) { - GdkColor pink = GDK_COLOR_INIT_SRGB (1, 105/255., 180/255., 1); - gsk_gpu_color_op (self->frame, gsk_gpu_clip_get_shader_clip (&self->clip, &self->offset, &node->bounds), self->ccs, self->opacity, &self->offset, &node->bounds, - &pink); - gdk_color_finish (&pink); + &GDK_COLOR_SRGB (1, 105/255., 180/255., 1)); } static void diff --git a/gsk/gskrendernodeparser.c b/gsk/gskrendernodeparser.c index 9f70510049..9ef40575fb 100644 --- a/gsk/gskrendernodeparser.c +++ b/gsk/gskrendernodeparser.c @@ -1704,7 +1704,7 @@ parse_color_node (GtkCssParser *parser, Context *context) { graphene_rect_t bounds = GRAPHENE_RECT_INIT (0, 0, 50, 50); - GdkColor color = GDK_COLOR_INIT_SRGB (1, 0, 0.8, 1); + GdkColor color = GDK_COLOR_SRGB (1, 0, 0.8, 1); const Declaration declarations[] = { { "bounds", parse_rect, NULL, &bounds }, { "color", parse_color2, NULL, &color },