[gtk: 5/5] Merge branch 'snazzy-demo' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 5/5] Merge branch 'snazzy-demo' into 'master'
- Date: Wed, 30 Sep 2020 15:01:00 +0000 (UTC)
commit 97ffd94d208f7be3bb318e289eb0853c6315ecda
Merge: 2dcf750198 d6648871b1
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Sep 30 15:00:58 2020 +0000
Merge branch 'snazzy-demo' into 'master'
gtk-demo: Make gltransitions demo a bit snazzier
See merge request GNOME/gtk!2644
demos/gtk-demo/background.glsl | 26 ++++++++++++++
demos/gtk-demo/demo.gresource.xml | 5 +--
demos/gtk-demo/fire.glsl | 72 ---------------------------------------
demos/gtk-demo/gltransition.c | 46 ++++++++++++++++++-------
demos/gtk-demo/gtkshaderbin.c | 27 +++++++++++++--
demos/gtk-demo/gtkshaderbin.h | 3 +-
demos/gtk-demo/gtkshaderstack.c | 9 +++++
demos/gtk-demo/gtkshaderstack.h | 4 ++-
demos/gtk-demo/ripple.glsl | 43 +++++++++++++++++++++++
gsk/gl/gskgldriver.c | 7 ++--
gsk/gl/gskgldriverprivate.h | 2 ++
gsk/gl/gskglrenderer.c | 5 ++-
12 files changed, 155 insertions(+), 94 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]