[gtk: 7/7] Merge branch 'wip/chergert/gdk-macos-gl-renderer' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 7/7] Merge branch 'wip/chergert/gdk-macos-gl-renderer' into 'master'
- Date: Thu, 29 Oct 2020 18:33:15 +0000 (UTC)
commit 61422382379f85606917a533e32d4e6691a6c62a
Merge: 931f130377 de9c9efa6f
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Oct 29 18:33:13 2020 +0000
Merge branch 'wip/chergert/gdk-macos-gl-renderer' into 'master'
macos: implement GL rendering on with Cairo renderer
See merge request GNOME/gtk!2759
gdk/macos/GdkMacosBaseView.c | 6 -
gdk/macos/GdkMacosCairoView.c | 6 +
gdk/macos/GdkMacosGLLayer.c | 157 ---------
gdk/macos/GdkMacosGLView.c | 124 +++++++
gdk/macos/{GdkMacosGLLayer.h => GdkMacosGLView.h} | 25 +-
gdk/macos/GdkMacosWindow.c | 42 +++
gdk/macos/gdkmacosdisplay.c | 5 +-
gdk/macos/gdkmacosglcontext-private.h | 6 +-
gdk/macos/gdkmacosglcontext.c | 387 ++++++++++++++++++----
gdk/macos/meson.build | 2 +-
gsk/resources/glsl/preamble.fs.glsl | 5 +-
11 files changed, 527 insertions(+), 238 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]