From 3bdb35c3d635efcfc1d02da3ed13824409819c9a Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Sat, 6 Jan 2024 21:39:17 +0100 Subject: Moved fx_renderer creation func into scenefx dir --- render/fx_renderer/fx_renderer.c | 5 +++-- render/fx_renderer/matrix.c | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'render') diff --git a/render/fx_renderer/fx_renderer.c b/render/fx_renderer/fx_renderer.c index da9437c..0b20d7e 100644 --- a/render/fx_renderer/fx_renderer.c +++ b/render/fx_renderer/fx_renderer.c @@ -20,10 +20,11 @@ #include #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 index 8cdce37..8f0fe15 100644 --- a/render/fx_renderer/matrix.c +++ b/render/fx_renderer/matrix.c @@ -2,7 +2,6 @@ #include #include -#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 */ -- cgit v1.2.3