matrix: move to types/

17 files changed, 18 insertions, 18 deletions

diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 0d1d527d..af701c6a 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -17,7 +17,7 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render.h>
 #include <wlr/render/gles2.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 7ee13843..13311df3 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -9,7 +9,7 @@
 #include <wlr/render.h>
 #include <wlr/render/egl.h>
 #include <wlr/render/gles2.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
 #include "backend/drm/drm.h"
 #include "glapi.h"
diff --git a/examples/multi-pointer.c b/examples/multi-pointer.c
index d3d425f2..6e56bfdc 100644
--- a/examples/multi-pointer.c
+++ b/examples/multi-pointer.c
@@ -11,7 +11,7 @@
 #include <wayland-server-protocol.h>
 #include <xkbcommon/xkbcommon.h>
 #include <GLES2/gl2.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
diff --git a/examples/output-layout.c b/examples/output-layout.c
index 45257be9..8ba77861 100644
--- a/examples/output-layout.c
+++ b/examples/output-layout.c
@@ -11,7 +11,7 @@
 #include <wayland-server-protocol.h>
 #include <xkbcommon/xkbcommon.h>
 #include <GLES2/gl2.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/util/log.h>
diff --git a/examples/pointer.c b/examples/pointer.c
index 0dbd02d2..e80b346a 100644
--- a/examples/pointer.c
+++ b/examples/pointer.c
@@ -11,7 +11,7 @@
 #include <wayland-server-protocol.h>
 #include <xkbcommon/xkbcommon.h>
 #include <GLES2/gl2.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
diff --git a/examples/rotation.c b/examples/rotation.c
index 1158ccc4..e38d53f4 100644
--- a/examples/rotation.c
+++ b/examples/rotation.c
@@ -10,7 +10,7 @@
 #include <wayland-server-protocol.h>
 #include <xkbcommon/xkbcommon.h>
 #include <GLES2/gl2.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
diff --git a/examples/tablet.c b/examples/tablet.c
index 5bfa1271..aa02c6f4 100644
--- a/examples/tablet.c
+++ b/examples/tablet.c
@@ -9,7 +9,7 @@
 #include <wayland-server-protocol.h>
 #include <xkbcommon/xkbcommon.h>
 #include <GLES2/gl2.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
diff --git a/examples/touch.c b/examples/touch.c
index 278252cc..7b4559b9 100644
--- a/examples/touch.c
+++ b/examples/touch.c
@@ -11,7 +11,7 @@
 #include <wayland-server-protocol.h>
 #include <xkbcommon/xkbcommon.h>
 #include <GLES2/gl2.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
 #include <wlr/backend.h>
diff --git a/include/wlr/render/matrix.h b/include/wlr/types/wlr_matrix.h
index a333bf0f..498b643c 100644
--- a/include/wlr/render/matrix.h
+++ b/include/wlr/types/wlr_matrix.h
@@ -1,5 +1,5 @@
-#ifndef WLR_RENDER_MATRIX_H
-#define WLR_RENDER_MATRIX_H
+#ifndef WLR_TYPES_WLR_MATRIX_H
+#define WLR_TYPES_WLR_MATRIX_H
 
 #include <stdint.h>
 #include <wlr/types/wlr_box.h>
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index ad739cf8..5b1395fb 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -9,7 +9,7 @@
 #include <wlr/render.h>
 #include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
 #include "render/gles2.h"
 #include "glapi.h"
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index 241b94a8..7a180446 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -8,7 +8,7 @@
 #include <wlr/render.h>
 #include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/util/log.h>
 #include "render/gles2.h"
 #include "util/signal.h"
diff --git a/render/meson.build b/render/meson.build
index 8aa70cea..4fe9ea67 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -15,7 +15,6 @@ lib_wlr_render = static_library(
 		'gles2/shaders.c',
 		'gles2/texture.c',
 		'gles2/util.c',
-		'matrix.c',
 		'wlr_renderer.c',
 		'wlr_texture.c',
 	),
diff --git a/rootston/output.c b/rootston/output.c
index 4d0a9c05..bdf025ad 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <time.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_wl_shell.h>
diff --git a/types/meson.build b/types/meson.build
index 703b06ca..91b4326d 100644
--- a/types/meson.build
+++ b/types/meson.build
@@ -6,10 +6,12 @@ lib_wlr_types = static_library(
 		'wlr_cursor.c',
 		'wlr_data_device.c',
 		'wlr_gamma_control.c',
+		'wlr_idle_inhibit_v1.c',
 		'wlr_idle.c',
 		'wlr_input_device.c',
 		'wlr_keyboard.c',
 		'wlr_list.c',
+		'wlr_matrix.c',
 		'wlr_output_damage.c',
 		'wlr_output_layout.c',
 		'wlr_output.c',
@@ -27,7 +29,6 @@ lib_wlr_types = static_library(
 		'wlr_xcursor_manager.c',
 		'wlr_xdg_shell_v6.c',
 		'wlr_xdg_shell.c',
-		'wlr_idle_inhibit_v1.c',
 	),
 	include_directories: wlr_inc,
 	dependencies: [pixman, xkbcommon, wayland_server, wlr_protos],
diff --git a/render/matrix.c b/types/wlr_matrix.c
index d5d7f49d..f3546e0e 100644
--- a/render/matrix.c
+++ b/types/wlr_matrix.c
@@ -1,7 +1,7 @@
 #include <math.h>
 #include <string.h>
 #include <wayland-server-protocol.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 
diff --git a/types/wlr_output.c b/types/wlr_output.c
index 7f19d1fe..21343a68 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -7,7 +7,7 @@
 #include <wayland-server.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_surface.h>
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 23966cd1..5d52fd2a 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -3,7 +3,7 @@
 #include <wayland-server.h>
 #include <wlr/render/egl.h>
 #include <wlr/render/interface.h>
-#include <wlr/render/matrix.h>
+#include <wlr/types/wlr_matrix.h>
 #include <wlr/types/wlr_region.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/log.h>