[gtk: 32/32] Merge branch 'wip/otte/nodeeditor2' into 'master'
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 32/32] Merge branch 'wip/otte/nodeeditor2' into 'master'
- Date: Sun, 5 May 2019 05:41:17 +0000 (UTC)
commit cfea8de6b50c65d4181a6204dd58587646f4e83a
Merge: bf2ae5aa81 d5d48af7f7
Author: Benjamin Otte <otte benjamin googlemail com>
Date: Sun May 5 05:40:54 2019 +0000
Merge branch 'wip/otte/nodeeditor2' into 'master'
Use a text based format for render node files
See merge request GNOME/gtk!815
.gitlab-ci/test-docker.sh | 1 -
demos/meson.build | 1 +
demos/node-editor/gtkrendererpaintable.c | 323 ++
demos/node-editor/gtkrendererpaintableprivate.h | 43 +
demos/node-editor/main.c | 28 +
demos/node-editor/meson.build | 18 +
demos/node-editor/node-editor-application.c | 114 +
demos/node-editor/node-editor-application.h | 38 +
demos/node-editor/node-editor-window.c | 541 ++++
demos/node-editor/node-editor-window.h | 42 +
demos/node-editor/node-editor-window.ui | 113 +
demos/node-editor/node-editor.gresource.xml | 6 +
docs/reference/gsk/gsk4-sections.txt | 7 +-
gsk/broadway/gskbroadwayrenderer.c | 23 +-
gsk/broadway/gskbroadwayrenderer.h | 52 +
gsk/broadway/gskbroadwayrendererprivate.h | 24 -
gsk/gl/gskglrenderer.c | 20 +-
gsk/gl/gskglrenderer.h | 47 +
gsk/gl/gskglrendererprivate.h | 23 -
gsk/gl/gskglrenderopsprivate.h | 2 +-
gsk/gsk.h | 5 +
gsk/gskcairorenderer.c | 42 +-
gsk/gskcairorenderer.h | 48 +
gsk/gskcairorendererprivate.h | 24 -
gsk/gskrenderer.c | 8 +-
gsk/gskrendernode.c | 49 +-
gsk/gskrendernode.h | 10 +-
gsk/gskrendernodeimpl.c | 1318 ---------
gsk/gskrendernodeparser.c | 1858 ++++++++++++
gsk/gskrendernodeparserprivate.h | 12 +
gsk/gskrendernodeprivate.h | 8 -
gsk/meson.build | 29 +-
gsk/vulkan/gskvulkanrenderer.c | 19 +
gsk/vulkan/gskvulkanrenderer.h | 51 +
gsk/vulkan/gskvulkanrendererprivate.h | 17 +-
gtk/css/gtkcssparser.c | 9 +
gtk/css/gtkcssparserprivate.h | 1 +
gtk/meson.build | 2 +
tests/rendernode.c | 17 +-
tests/showrendernode.c | 14 +-
testsuite/gsk/blendmode.node | Bin 640320 -> 0 bytes
testsuite/gsk/blendmode.png | Bin 1983 -> 0 bytes
testsuite/gsk/blendmode.vulkan.png | Bin 1983 -> 0 bytes
testsuite/gsk/blendmodes.node | Bin 589787 -> 0 bytes
testsuite/gsk/blendmodes.png | Bin 122534 -> 0 bytes
testsuite/gsk/blendmodes.vulkan.png | Bin 123535 -> 0 bytes
testsuite/gsk/cairo.node | Bin 480079 -> 0 bytes
testsuite/gsk/cairo.png | Bin 1614 -> 0 bytes
testsuite/gsk/colors.cairo.png | Bin 77248 -> 0 bytes
testsuite/gsk/colors.node | Bin 92029 -> 0 bytes
testsuite/gsk/colors.vulkan.png | Bin 77366 -> 0 bytes
testsuite/gsk/compare-render.c | 14 +-
testsuite/gsk/compare/clip-coordinates-3d.node | 19 +
testsuite/gsk/compare/clip-coordinates-3d.png | Bin 0 -> 269 bytes
testsuite/gsk/compare/clipped_rounded_clip.node | 41 +
testsuite/gsk/compare/clipped_rounded_clip.png | Bin 0 -> 3111 bytes
testsuite/gsk/compare/cross-fade-in-opacity.node | 23 +
testsuite/gsk/compare/cross-fade-in-opacity.png | Bin 0 -> 618 bytes
testsuite/gsk/compare/opacity_clip.node | 36 +
testsuite/gsk/compare/opacity_clip.png | Bin 0 -> 1913 bytes
.../gsk/compare/outset_shadow_offset_both.node | 8 +
.../outset_shadow_offset_both.png} | Bin
testsuite/gsk/compare/outset_shadow_offset_x.node | 8 +
.../outset_shadow_offset_x.png} | Bin
testsuite/gsk/compare/outset_shadow_offset_y.node | 8 +
.../outset_shadow_offset_y.png} | Bin
.../gsk/compare/outset_shadow_rounded_top.node | 39 +
.../gsk/compare/outset_shadow_rounded_top.png | Bin 0 -> 1523 bytes
testsuite/gsk/compare/outset_shadow_simple.node | 8 +
.../outset_shadow_simple.png} | Bin
testsuite/gsk/compare/shadow-in-opacity.node | 24 +
testsuite/gsk/compare/shadow-in-opacity.png | Bin 0 -> 408 bytes
testsuite/gsk/cross-fade.node | Bin 640324 -> 0 bytes
testsuite/gsk/cross-fade.png | Bin 1972 -> 0 bytes
testsuite/gsk/cross-fade.vulkan.png | Bin 2000 -> 0 bytes
testsuite/gsk/cross-fades.node | Bin 983611 -> 0 bytes
testsuite/gsk/cross-fades.png | Bin 39609 -> 0 bytes
testsuite/gsk/cross-fades.vulkan.png | Bin 39998 -> 0 bytes
testsuite/gsk/ducky.png | Bin 248546 -> 0 bytes
testsuite/gsk/gl/clipped_cross_fade.gl.png | Bin 157 -> 0 bytes
testsuite/gsk/gl/clipped_cross_fade.node | Bin 1111 -> 0 bytes
testsuite/gsk/gl/clipped_rounded_clip.gl.png | Bin 613 -> 0 bytes
testsuite/gsk/gl/clipped_rounded_clip.node | Bin 271 -> 0 bytes
testsuite/gsk/gl/cross_fade.gl.png | Bin 1639 -> 0 bytes
testsuite/gsk/gl/cross_fade.node | Bin 302 -> 0 bytes
testsuite/gsk/gl/cross_fade_transformed.gl.png | Bin 1681 -> 0 bytes
testsuite/gsk/gl/cross_fade_transformed.node | Bin 459 -> 0 bytes
testsuite/gsk/gl/gradient_clipped.gl.png | Bin 1072 -> 0 bytes
testsuite/gsk/gl/gradient_clipped.node | Bin 310 -> 0 bytes
testsuite/gsk/gl/gradient_simple.gl.png | Bin 394 -> 0 bytes
testsuite/gsk/gl/gradient_simple.node | Bin 383 -> 0 bytes
testsuite/gsk/gl/gradient_transformed.gl.png | Bin 744 -> 0 bytes
testsuite/gsk/gl/gradient_transformed.node | Bin 540 -> 0 bytes
testsuite/gsk/gl/opacity_clip.gl.png | Bin 543 -> 0 bytes
testsuite/gsk/gl/opacity_clip.node | Bin 293 -> 0 bytes
.../gsk/gl/outset_shadow_blurred_offset.gl.png | Bin 1048 -> 0 bytes
testsuite/gsk/gl/outset_shadow_blurred_offset.node | Bin 208 -> 0 bytes
.../gsk/gl/outset_shadow_blurred_simple.gl.png | Bin 7660 -> 0 bytes
testsuite/gsk/gl/outset_shadow_blurred_simple.node | Bin 208 -> 0 bytes
.../gsk/gl/outset_shadow_blurred_simple2.gl.png | Bin 344 -> 0 bytes
.../gsk/gl/outset_shadow_blurred_simple2.node | Bin 208 -> 0 bytes
.../gsk/gl/outset_shadow_blurred_small.gl.png | Bin 1044 -> 0 bytes
testsuite/gsk/gl/outset_shadow_blurred_small.node | Bin 208 -> 0 bytes
testsuite/gsk/gl/outset_shadow_offset_both.node | Bin 208 -> 0 bytes
testsuite/gsk/gl/outset_shadow_offsetx.node | Bin 208 -> 0 bytes
testsuite/gsk/gl/outset_shadow_offsety.node | Bin 208 -> 0 bytes
testsuite/gsk/gl/outset_shadow_rounded1.gl.png | Bin 2646 -> 0 bytes
testsuite/gsk/gl/outset_shadow_rounded1.node | Bin 208 -> 0 bytes
testsuite/gsk/gl/outset_shadow_rounded2.gl.png | Bin 4457 -> 0 bytes
testsuite/gsk/gl/outset_shadow_rounded2.node | Bin 208 -> 0 bytes
testsuite/gsk/gl/outset_shadow_rounded_top.gl.png | Bin 761 -> 0 bytes
testsuite/gsk/gl/outset_shadow_rounded_top.node | Bin 208 -> 0 bytes
testsuite/gsk/gl/outset_shadow_simple.node | Bin 208 -> 0 bytes
testsuite/gsk/gl/outset_shadow_translated.gl.png | Bin 790 -> 0 bytes
testsuite/gsk/gl/outset_shadow_translated.node | Bin 366 -> 0 bytes
testsuite/gsk/gl/shadow_transform1.gl.png | Bin 1011 -> 0 bytes
testsuite/gsk/gl/shadow_transform1.node | Bin 1539 -> 0 bytes
.../gsk/gl/transformed_clipped_rounded_clip.gl.png | Bin 613 -> 0 bytes
.../gsk/gl/transformed_clipped_rounded_clip.node | Bin 428 -> 0 bytes
testsuite/gsk/meson.build | 170 +-
testsuite/gsk/node-parser.c | 44 +
testsuite/gsk/nodeparser/crash1.node | 2 +
testsuite/gsk/nodeparser/crash2.node | 3 +
testsuite/gsk/nodeparser/crash3.node | 18 +
testsuite/gsk/nodeparser/crash4.node | 7 +
testsuite/gsk/opacity.node | Bin 183252 -> 0 bytes
testsuite/gsk/opacity.png | Bin 36738 -> 0 bytes
testsuite/gsk/opacity.vulkan.png | Bin 37207 -> 0 bytes
testsuite/gsk/repeat.node | Bin 1921103 -> 0 bytes
testsuite/gsk/repeat.png | Bin 2578 -> 0 bytes
testsuite/gsk/serialize-deserialize.c | 58 +
testsuite/gsk/serializedeserialize/blend.node | 16 +
testsuite/gsk/serializedeserialize/border.node | 5 +
testsuite/gsk/serializedeserialize/color.node | 4 +
testsuite/gsk/serializedeserialize/debug.node | 4 +
.../gsk/serializedeserialize/rounded-rect.node | 83 +
testsuite/gsk/serializedeserialize/shadow.node | 7 +
testsuite/gsk/serializedeserialize/testswitch.node | 389 +++
.../gsk/serializedeserialize/widgetfactory.node | 3112 ++++++++++++++++++++
testsuite/gsk/test-render-nodes.c | 933 ------
testsuite/gsk/transform.node | Bin 183134 -> 0 bytes
testsuite/gsk/transform.png | Bin 50871 -> 0 bytes
testsuite/gsk/transform.vulkan.png | Bin 50864 -> 0 bytes
143 files changed, 7584 insertions(+), 2506 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
