[gtk/wip/otte/lottie: 1/17] build: Include GSK types in gtk_test_register_all_type()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/lottie: 1/17] build: Include GSK types in gtk_test_register_all_type()
- Date: Tue, 17 Nov 2020 00:18:25 +0000 (UTC)
commit 077e924c402090d7181e99b5cd4863cf33ff7199
Author: Benjamin Otte <otte redhat com>
Date: Mon Nov 16 20:16:53 2020 +0100
build: Include GSK types in gtk_test_register_all_type()
gtk/gtktestutils.c | 10 ++++++++++
gtk/meson.build | 1 +
testsuite/gtk/notify.c | 6 ++++++
testsuite/gtk/objects-finalize.c | 6 ++++++
4 files changed, 23 insertions(+)
---
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 35691d0c3d..690931a153 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -40,6 +40,16 @@
#include <gtk/gtk.h>
#define GTK_COMPILATION
+#include <gsk/gl/gskglrenderer.h>
+
+#ifdef GDK_WINDOWING_BROADWAY
+#include <gsk/broadway/gskbroadwayrenderer.h>
+#endif
+
+#ifdef GDK_RENDERING_VULKAN
+#include <gsk/vulkan/gskvulkanrenderer.h>
+#endif
+
#ifdef GDK_WINDOWING_X11
#include <gdk/x11/gdkx.h>
#endif
diff --git a/gtk/meson.build b/gtk/meson.build
index 614b4079f8..77936af567 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -925,6 +925,7 @@ typefuncs = custom_target('gtktypefuncs.inc',
depends: [ gdkenum_h, gskenum_h, ],
output: 'gtktypefuncs.inc',
input: gdk_headers +
+ gsk_public_headers +
gtk_public_headers +
gtk_deprecated_headers +
[ gtktypebuiltins_h, ] +
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 80df7dda62..f90fb66be2 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -454,6 +454,12 @@ test_type (gconstpointer data)
NULL);
gdk_content_formats_unref (formats);
}
+ else if (g_type_is_a (type, GSK_TYPE_GL_SHADER))
+ {
+ GBytes *bytes = g_bytes_new_static ("", 0);
+ instance = g_object_new (type, "source", bytes, NULL);
+ g_bytes_unref (bytes);
+ }
else if (g_type_is_a (type, GTK_TYPE_FILTER_LIST_MODEL) ||
g_type_is_a (type, GTK_TYPE_NO_SELECTION) ||
g_type_is_a (type, GTK_TYPE_SINGLE_SELECTION) ||
diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index c105ca265c..2167d384d5 100644
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -69,6 +69,12 @@ test_finalize_object (gconstpointer data)
NULL);
gdk_content_formats_unref (formats);
}
+ else if (g_type_is_a (test_type, GSK_TYPE_GL_SHADER))
+ {
+ GBytes *bytes = g_bytes_new_static ("", 0);
+ object = g_object_new (test_type, "source", bytes, NULL);
+ g_bytes_unref (bytes);
+ }
else if (g_type_is_a (test_type, GTK_TYPE_FILTER_LIST_MODEL) ||
g_type_is_a (test_type, GTK_TYPE_NO_SELECTION) ||
g_type_is_a (test_type, GTK_TYPE_SINGLE_SELECTION) ||
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]