diff options
| author | Erik Reider <[email protected]> | 2024-01-08 09:23:32 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-08 09:23:32 +0100 |
| commit | b875d712407115b381915495e50875cfc523b76d (patch) | |
| tree | 4f050bcb1a18179accd390749420d00714664691 /render/fx_renderer | |
| parent | 6759e8da7ab53a46b0eb04e5045b8c67262c3a11 (diff) | |
| parent | cc83f41dbfc12af350c37f46677b82a64df801b8 (diff) | |
Merge pull request #27 from wlrfx/add_back_xkbcommon_dep
Meson fixes
Diffstat (limited to 'render/fx_renderer')
| -rw-r--r-- | render/fx_renderer/fx_pass.c | 2 | ||||
| -rw-r--r-- | render/fx_renderer/fx_renderer.c | 5 | ||||
| -rw-r--r-- | render/fx_renderer/meson.build | 7 |
3 files changed, 10 insertions, 4 deletions
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/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/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) |