[gtk: 7/7] Merge branch 'wip/otte/for-main' into 'main'




commit e80238120e37f4daef7cf0fee4b2b3dec2ecfc2c
Merge: 50e4ca8593 07cfdd8ca0
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Tue Nov 30 14:25:22 2021 +0000

    Merge branch 'wip/otte/for-main' into 'main'
    
    texture: Remove gdk_texture_download_float()
    
    See merge request GNOME/gtk!4202

 demos/node-editor/node-editor-window.c             |  41 +++++-
 gdk/gdktexture.c                                   |  45 +------
 gsk/gl/resources/conic_gradient.glsl               |   4 +-
 gsk/gl/resources/linear_gradient.glsl              |   4 +-
 gsk/gl/resources/preamble.glsl                     |   2 -
 gsk/gl/resources/radial_gradient.glsl              |   4 +-
 gsk/gskrendernodeimpl.c                            |  20 ++-
 gtk/gtklabel.c                                     |  24 +++-
 testsuite/gdk/memorytexture.c                      | 139 ---------------------
 testsuite/gdk/texture-threads.c                    |   6 -
 .../reftests/hbox-with-ellipsizing-label.ref.ui    |  15 +++
 testsuite/reftests/hbox-with-ellipsizing-label.ui  |  16 +++
 .../hbox-with-ellipsizing-wrapping-label.ref.ui    |  17 +++
 .../hbox-with-ellipsizing-wrapping-label.ui        |  18 +++
 testsuite/reftests/label-sizing.ref.ui             |   1 -
 testsuite/reftests/label-sizing.ui                 |   1 -
 testsuite/reftests/meson.build                     |   4 +
 testsuite/testutils.c                              |   2 +-
 testsuite/testutils.h                              |   2 +-
 19 files changed, 145 insertions(+), 220 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]