matrix: move to types/

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>

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"

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>

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>

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>

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>

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>

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>

include/wlr/types/wlr_matrix.h

@@ -1,5 +1,5 @@
-#ifndef WLR_RENDER_MATRIX_H
+#ifndef WLR_TYPES_WLR_MATRIX_H
-#define WLR_RENDER_MATRIX_H
+#define WLR_TYPES_WLR_MATRIX_H
 
 #include <stdint.h>
 #include <wlr/types/wlr_box.h>

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"

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"

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',
 	),

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>

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],

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>
 

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>

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>