summaryrefslogtreecommitdiff
path: root/render/fx_renderer
diff options
context:
space:
mode:
Diffstat (limited to 'render/fx_renderer')
-rw-r--r--render/fx_renderer/fx_renderer.c5
-rw-r--r--render/fx_renderer/matrix.c5
2 files changed, 3 insertions, 7 deletions
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 <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
index 8cdce37..8f0fe15 100644
--- 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 */