From: Benjamin Otte Date: Sat, 14 Apr 2018 20:45:33 +0000 (+0200) Subject: gdk: Remove GDK_DEBUG=cairo-image X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~397 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=899674d4453b4d74502414e67ab0cefc4fbf8273;p=gtk4.git gdk: Remove GDK_DEBUG=cairo-image This is the default now - at least until cairo rendering gets split into backends. --- diff --git a/gdk/gdk.c b/gdk/gdk.c index 6bce57c5e0..72d1478f69 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -150,8 +150,7 @@ static const GDebugKey gdk_debug_keys[] = { { "gl-legacy", GDK_DEBUG_GL_LEGACY }, { "gl-gles", GDK_DEBUG_GL_GLES }, { "vulkan-disable", GDK_DEBUG_VULKAN_DISABLE }, - { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE }, - { "cairo-image", GDK_DEBUG_CAIRO_IMAGE } + { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE } }; #endif diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index 4496fb237c..4ffcb79b79 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -64,8 +64,7 @@ typedef enum { GDK_DEBUG_GL_LEGACY = 1 << 15, GDK_DEBUG_GL_GLES = 1 << 16, GDK_DEBUG_VULKAN_DISABLE = 1 << 17, - GDK_DEBUG_VULKAN_VALIDATE = 1 << 18, - GDK_DEBUG_CAIRO_IMAGE = 1 << 19 + GDK_DEBUG_VULKAN_VALIDATE = 1 << 18 } GdkDebugFlags; extern guint _gdk_debug_flags; diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 274b492485..2e04237cc2 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -4610,30 +4610,17 @@ gdk_surface_create_similar_surface (GdkSurface * surface, int width, int height) { - cairo_surface_t *surface_surface, *similar_surface; - double sx, sy; + cairo_surface_t *similar_surface; + int scale; g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL); - surface_surface = gdk_surface_ref_impl_surface (surface); - sx = sy = 1; - cairo_surface_get_device_scale (surface_surface, &sx, &sy); - - if (GDK_DISPLAY_DEBUG_CHECK (surface->display, CAIRO_IMAGE)) - { - similar_surface = cairo_image_surface_create (content == CAIRO_CONTENT_COLOR ? CAIRO_FORMAT_RGB24 : - content == CAIRO_CONTENT_ALPHA ? CAIRO_FORMAT_A8 : CAIRO_FORMAT_ARGB32, - width * sx, height * sy); - cairo_surface_set_device_scale (similar_surface, sx, sy); - } - else - { - similar_surface = cairo_surface_create_similar (surface_surface, - content, - width, height); - } + scale = gdk_surface_get_scale_factor (surface); - cairo_surface_destroy (surface_surface); + similar_surface = cairo_image_surface_create (content == CAIRO_CONTENT_COLOR ? CAIRO_FORMAT_RGB24 : + content == CAIRO_CONTENT_ALPHA ? CAIRO_FORMAT_A8 : CAIRO_FORMAT_ARGB32, + width * scale, height * scale); + cairo_surface_set_device_scale (similar_surface, scale, scale); return similar_surface; } diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c index c2ea6aca11..23bd753097 100644 --- a/gtk/inspector/visual.c +++ b/gtk/inspector/visual.c @@ -68,7 +68,6 @@ struct _GtkInspectorVisualPrivate GtkAdjustment *cursor_size_adjustment; GtkWidget *debug_box; - GtkWidget *rendering_mode_combo; GtkWidget *baselines_switch; GtkWidget *layout_switch; GtkWidget *touchscreen_switch; @@ -836,34 +835,6 @@ init_gl (GtkInspectorVisual *vis) } } -static void -init_rendering_mode (GtkInspectorVisual *vis) -{ - GdkDebugFlags flags = gdk_display_get_debug_flags (gdk_display_get_default ()); - int mode = 0; - - if (flags & GDK_DEBUG_CAIRO_IMAGE) - mode = 1; - - gtk_combo_box_set_active (GTK_COMBO_BOX (vis->priv->rendering_mode_combo), mode); -} - -static void -rendering_mode_changed (GtkComboBox *c, - GtkInspectorVisual *vis) -{ - GdkDebugFlags flags = gdk_display_get_debug_flags (gdk_display_get_default ()); - int mode; - - mode = gtk_combo_box_get_active (c); - - flags = flags & ~GDK_DEBUG_CAIRO_IMAGE; - if (mode == 1) - flags = flags | GDK_DEBUG_CAIRO_IMAGE; - - gdk_display_set_debug_flags (gdk_display_get_default (), flags); -} - static void update_gl_flag (GtkSwitch *sw, GdkDebugFlags flag) @@ -904,7 +875,6 @@ gtk_inspector_visual_init (GtkInspectorVisual *vis) init_font (vis); init_font_scale (vis); init_scale (vis); - init_rendering_mode (vis); init_animation (vis); init_slowdown (vis); init_touchscreen (vis); @@ -936,7 +906,6 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass) object_class->constructed = gtk_inspector_visual_constructed; gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/visual.ui"); - gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, rendering_mode_combo); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, direction_combo); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, baselines_switch); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorVisual, layout_switch); @@ -965,7 +934,6 @@ gtk_inspector_visual_class_init (GtkInspectorVisualClass *klass) gtk_widget_class_bind_template_callback (widget_class, fps_activate); gtk_widget_class_bind_template_callback (widget_class, updates_activate); gtk_widget_class_bind_template_callback (widget_class, direction_changed); - gtk_widget_class_bind_template_callback (widget_class, rendering_mode_changed); gtk_widget_class_bind_template_callback (widget_class, baselines_activate); gtk_widget_class_bind_template_callback (widget_class, layout_activate); gtk_widget_class_bind_template_callback (widget_class, widget_resize_activate); diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui index 4cd7913bf4..923c9a7527 100644 --- a/gtk/inspector/visual.ui +++ b/gtk/inspector/visual.ui @@ -374,37 +374,6 @@ none - - - 0 - - - 10 - 40 - - - Rendering Mode - start - baseline - 0.0 - - - - - end - baseline - 1 - - - Similar - Image - - - - - - - 0 @@ -678,7 +647,6 @@ - @@ -695,7 +663,6 @@ -