Moved wlr_scene.h and shadow_data.h into scenefx dir

12 files changed, 23 insertions, 10 deletions

diff --git a/include/meson.build b/include/meson.build
new file mode 100644
index 0000000..7b80d63
--- /dev/null
+++ b/include/meson.build
@@ -0,0 +1,6 @@
+exclude_files = ['meson.build']
+
+install_subdir('scenefx',
+	install_dir: get_option('includedir'),
+	exclude_files: exclude_files,
+)
diff --git a/include/render/fx_renderer/fx_renderer.h b/include/render/fx_renderer/fx_renderer.h
index 4d99866..5bf9a09 100644
--- a/include/render/fx_renderer/fx_renderer.h
+++ b/include/render/fx_renderer/fx_renderer.h
@@ -13,7 +13,7 @@
 
 #include "render/fx_renderer/shaders.h"
 #include "render/pass.h"
-#include "types/fx/shadow_data.h"
+#include "scenefx/types/fx/shadow_data.h"
 
 struct fx_pixel_format {
 	uint32_t drm_format;
diff --git a/include/render/pass.h b/include/render/pass.h
index 05bf1e9..52666fe 100644
--- a/include/render/pass.h
+++ b/include/render/pass.h
@@ -5,7 +5,7 @@
 #include <wlr/render/pass.h>
 #include <wlr/util/box.h>
 #include <wlr/render/interface.h>
-#include "types/fx/shadow_data.h"
+#include "scenefx/types/fx/shadow_data.h"
 
 struct fx_gles_render_pass {
 	struct wlr_render_pass base;
diff --git a/include/scenefx/meson.build b/include/scenefx/meson.build
new file mode 100644
index 0000000..7f01333
--- /dev/null
+++ b/include/scenefx/meson.build
@@ -0,0 +1 @@
+install_headers(subdir: 'wlr')
diff --git a/include/types/fx/shadow_data.h b/include/scenefx/types/fx/shadow_data.h
index d96a084..d96a084 100644
--- a/include/types/fx/shadow_data.h
+++ b/include/scenefx/types/fx/shadow_data.h
diff --git a/include/wlr/types/wlr_scene.h b/include/scenefx/types/wlr_scene.h
index f52e167..21558d8 100644
--- a/include/wlr/types/wlr_scene.h
+++ b/include/scenefx/types/wlr_scene.h
@@ -20,11 +20,11 @@
  */
 
 #include <pixman.h>
+#include "scenefx/types/fx/shadow_data.h"
 #include <time.h>
 #include <wayland-server-core.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_damage_ring.h>
-#include "types/fx/shadow_data.h"
 #include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/util/addon.h>
 #include <wlr/util/box.h>
diff --git a/meson.build b/meson.build
index 2936768..8288a96 100644
--- a/meson.build
+++ b/meson.build
@@ -152,6 +152,8 @@ subdir('render')
 subdir('types')
 subdir('util')
 
+subdir('include')
+
 scenefx_inc = include_directories('include')
 
 lib_scenefx = library(
diff --git a/render/fx_renderer/fx_pass.c b/render/fx_renderer/fx_pass.c
index 9a8c90c..231de33 100644
--- a/render/fx_renderer/fx_pass.c
+++ b/render/fx_renderer/fx_pass.c
@@ -11,7 +11,7 @@
 #include "render/fx_renderer/fx_renderer.h"
 #include "render/fx_renderer/matrix.h"
 #include "render/pass.h"
-#include "types/fx/shadow_data.h"
+#include "scenefx/types/fx/shadow_data.h"
 
 #define MAX_QUADS 86 // 4kb
 
diff --git a/render/fx_renderer/matrix.c b/render/fx_renderer/matrix.c
index 8f0fe15..8cdce37 100644
--- a/render/fx_renderer/matrix.c
+++ b/render/fx_renderer/matrix.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <wlr/types/wlr_output.h>
 
+#include "config.h"
 #include "render/fx_renderer/matrix.h"
 
 static const float transforms[][9] = {
@@ -47,6 +48,8 @@ static const float transforms[][9] = {
 	},
 };
 
+#if !HAVE_WLROOTS_SUBPROJECT
+
 void matrix_projection(float mat[static 9], int width, int height,
 		enum wl_output_transform transform) {
 	memset(mat, 0, sizeof(*mat) * 9);
@@ -68,3 +71,5 @@ void matrix_projection(float mat[static 9], int width, int height,
 	// Identity
 	mat[8] = 1.0f;
 }
+
+#endif /* ifndef HAVE_WLROOTS_SUBPROJECT */
diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
index 03fafee..0db1661 100644
--- a/tinywl/tinywl.c
+++ b/tinywl/tinywl.c
@@ -5,7 +5,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
-#include <types/fx/shadow_data.h>
+#include <scenefx/types/fx/shadow_data.h>
+#include <scenefx/types/wlr_scene.h>
 #include <unistd.h>
 #include <wayland-server-core.h>
 #include <wayland-util.h>
@@ -27,8 +28,6 @@
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
 
-#include "types/wlr_scene.h"
-
 #include "render/fx_renderer/fx_renderer.h"
 
 /* For brevity's sake, struct members are annotated where they are used. */
diff --git a/types/fx/shadow_data.c b/types/fx/shadow_data.c
index fae76cf..a8ad8f9 100644
--- a/types/fx/shadow_data.c
+++ b/types/fx/shadow_data.c
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "types/fx/shadow_data.h"
+#include "scenefx/types/fx/shadow_data.h"
 #include "wlr/util/log.h"
 
 struct shadow_data shadow_data_get_default(void) {
diff --git a/types/scene/wlr_scene.c b/types/scene/wlr_scene.c
index 8ded6a8..e9f765c 100644
--- a/types/scene/wlr_scene.c
+++ b/types/scene/wlr_scene.c
@@ -1,6 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <assert.h>
 #include <stdlib.h>
+#include <scenefx/types/wlr_scene.h>
 #include <string.h>
 #include <wlr/backend.h>
 #include <wlr/render/gles2.h>
@@ -8,7 +9,6 @@
 #include <wlr/types/wlr_damage_ring.h>
 #include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_presentation_time.h>
-#include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_subcompositor.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/log.h>
@@ -16,7 +16,7 @@
 #include <wlr/render/swapchain.h>
 
 #include "render/pass.h"
-#include "types/fx/shadow_data.h"
+#include "scenefx/types/fx/shadow_data.h"
 #include "types/wlr_buffer.h"
 #include "types/wlr_output.h"
 #include "types/wlr_scene.h"