From 3e6108472c3d578175ea6fb685e1919b3585606f Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Sat, 6 Jan 2024 21:24:37 +0100 Subject: Moved wlr_scene.h and shadow_data.h into scenefx dir --- render/fx_renderer/fx_pass.c | 2 +- render/fx_renderer/matrix.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'render') diff --git a/render/fx_renderer/fx_pass.c b/render/fx_renderer/fx_pass.c index 9a8c90c..231de33 100644 --- a/render/fx_renderer/fx_pass.c +++ b/render/fx_renderer/fx_pass.c @@ -11,7 +11,7 @@ #include "render/fx_renderer/fx_renderer.h" #include "render/fx_renderer/matrix.h" #include "render/pass.h" -#include "types/fx/shadow_data.h" +#include "scenefx/types/fx/shadow_data.h" #define MAX_QUADS 86 // 4kb diff --git a/render/fx_renderer/matrix.c b/render/fx_renderer/matrix.c index 8f0fe15..8cdce37 100644 --- a/render/fx_renderer/matrix.c +++ b/render/fx_renderer/matrix.c @@ -2,6 +2,7 @@ #include #include +#include "config.h" #include "render/fx_renderer/matrix.h" static const float transforms[][9] = { @@ -47,6 +48,8 @@ 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); @@ -68,3 +71,5 @@ 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 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 From cc83f41dbfc12af350c37f46677b82a64df801b8 Mon Sep 17 00:00:00 2001 From: Erik Reider <35975961+ErikReider@users.noreply.github.com> Date: Sat, 6 Jan 2024 22:53:32 +0100 Subject: Compile wlroots subproject dep staticly --- render/fx_renderer/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'render') diff --git a/render/fx_renderer/meson.build b/render/fx_renderer/meson.build index d7160a8..10e757b 100644 --- a/render/fx_renderer/meson.build +++ b/render/fx_renderer/meson.build @@ -6,7 +6,6 @@ elif 'auto' in renderers and get_option('auto_features').disabled() endif wlr_files += files( - 'matrix.c', 'util.c', 'shaders.c', 'pixel_format.c', @@ -16,6 +15,12 @@ wlr_files += files( 'fx_renderer.c', ) +if not wlroots_is_sub + wlr_files += files([ + 'matrix.c', + ]) +endif + if 'gles2' in renderers or 'auto' in renderers egl = dependency('egl', required: 'gles2' in renderers) gbm = dependency('gbm', required: 'gles2' in renderers) -- cgit v1.2.3