Moved fx_renderer creation func into scenefx dir

0xNULLderef · Jan 7, 2024 · 3bdb35c · 3bdb35c
1 parent 3e61084
commit 3bdb35c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/include/render/fx_renderer/fx_renderer.h b/include/render/fx_renderer/fx_renderer.h
@@ -166,8 +166,6 @@ struct fx_render_timer *fx_get_render_timer(
 struct fx_texture *fx_get_texture(
 	struct wlr_texture *wlr_texture);
 
-struct wlr_renderer *fx_renderer_create_with_drm_fd(int drm_fd);
-struct wlr_renderer *fx_renderer_create(struct wlr_backend *backend);
 struct wlr_renderer *fx_renderer_create_egl(struct wlr_egl *egl);
 
 struct wlr_egl *wlr_fx_renderer_get_egl(struct wlr_renderer *renderer);

diff --git a/include/scenefx/fx_renderer/fx_renderer.h b/include/scenefx/fx_renderer/fx_renderer.h
@@ -0,0 +1,9 @@
+#ifndef SCENEFX_FX_OPENGL_H
+#define SCENEFX_FX_OPENGL_H
+
+#include <wlr/backend.h>
+
+struct wlr_renderer *fx_renderer_create_with_drm_fd(int drm_fd);
+struct wlr_renderer *fx_renderer_create(struct wlr_backend *backend);
+
+#endif
diff --git a/render/fx_renderer/fx_renderer.c b/render/fx_renderer/fx_renderer.c
@@ -20,10 +20,11 @@
 #include <wlr/util/log.h>
 
 #include "render/egl.h"
+#include "render/pixel_format.h"
+#include "render/fx_renderer/util.h"
 #include "render/fx_renderer/fx_renderer.h"
+#include "scenefx/fx_renderer/fx_renderer.h"
 #include "render/fx_renderer/matrix.h"
-#include "render/fx_renderer/util.h"
-#include "render/pixel_format.h"
 #include "util/time.h"
 
 static const GLfloat verts[] = {

diff --git a/render/fx_renderer/matrix.c b/render/fx_renderer/matrix.c
@@ -2,7 +2,6 @@
 #include <string.h>
 #include <wlr/types/wlr_output.h>
 
-#include "config.h"
 #include "render/fx_renderer/matrix.h"
 
 static const float transforms[][9] = {
@@ -48,8 +47,6 @@ 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);
@@ -71,5 +68,3 @@ 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
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
+#include <scenefx/fx_renderer/fx_renderer.h>
 #include <scenefx/types/fx/shadow_data.h>
 #include <scenefx/types/wlr_scene.h>
 #include <unistd.h>
@@ -28,8 +29,6 @@
 #include <wlr/util/log.h>
 #include <xkbcommon/xkbcommon.h>
 
-#include "render/fx_renderer/fx_renderer.h"
-
 /* For brevity's sake, struct members are annotated where they are used. */
 enum tinywl_cursor_mode {
 	TINYWL_CURSOR_PASSTHROUGH,