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 /include | |
| parent | 6759e8da7ab53a46b0eb04e5045b8c67262c3a11 (diff) | |
| parent | cc83f41dbfc12af350c37f46677b82a64df801b8 (diff) | |
Merge pull request #27 from wlrfx/add_back_xkbcommon_dep
Meson fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/meson.build | 6 | ||||
| -rw-r--r-- | include/render/fx_renderer/fx_renderer.h | 4 | ||||
| -rw-r--r-- | include/render/pass.h | 2 | ||||
| -rw-r--r-- | include/scenefx/fx_renderer/fx_renderer.h | 9 | ||||
| -rw-r--r-- | include/scenefx/meson.build | 1 | ||||
| -rw-r--r-- | include/scenefx/types/fx/shadow_data.h (renamed from include/types/fx/shadow_data.h) | 0 | ||||
| -rw-r--r-- | include/scenefx/types/wlr_scene.h (renamed from include/wlr/types/wlr_scene.h) | 2 |
7 files changed, 19 insertions, 5 deletions
diff --git a/include/meson.build b/include/meson.build new file mode 100644 index 0000000..7b80d63 --- /dev/null +++ b/include/meson.build @@ -0,0 +1,6 @@ +exclude_files = ['meson.build'] + +install_subdir('scenefx', + install_dir: get_option('includedir'), + exclude_files: exclude_files, +) diff --git a/include/render/fx_renderer/fx_renderer.h b/include/render/fx_renderer/fx_renderer.h index 4d99866..4a95634 100644 --- a/include/render/fx_renderer/fx_renderer.h +++ b/include/render/fx_renderer/fx_renderer.h @@ -13,7 +13,7 @@ #include "render/fx_renderer/shaders.h" #include "render/pass.h" -#include "types/fx/shadow_data.h" +#include "scenefx/types/fx/shadow_data.h" struct fx_pixel_format { uint32_t drm_format; @@ -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/render/pass.h b/include/render/pass.h index 05bf1e9..52666fe 100644 --- a/include/render/pass.h +++ b/include/render/pass.h @@ -5,7 +5,7 @@ #include <wlr/render/pass.h> #include <wlr/util/box.h> #include <wlr/render/interface.h> -#include "types/fx/shadow_data.h" +#include "scenefx/types/fx/shadow_data.h" struct fx_gles_render_pass { struct wlr_render_pass base; diff --git a/include/scenefx/fx_renderer/fx_renderer.h b/include/scenefx/fx_renderer/fx_renderer.h new file mode 100644 index 0000000..2e64ffb --- /dev/null +++ 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/include/scenefx/meson.build b/include/scenefx/meson.build new file mode 100644 index 0000000..7f01333 --- /dev/null +++ b/include/scenefx/meson.build @@ -0,0 +1 @@ +install_headers(subdir: 'wlr') diff --git a/include/types/fx/shadow_data.h b/include/scenefx/types/fx/shadow_data.h index d96a084..d96a084 100644 --- a/include/types/fx/shadow_data.h +++ b/include/scenefx/types/fx/shadow_data.h diff --git a/include/wlr/types/wlr_scene.h b/include/scenefx/types/wlr_scene.h index f52e167..21558d8 100644 --- a/include/wlr/types/wlr_scene.h +++ b/include/scenefx/types/wlr_scene.h @@ -20,11 +20,11 @@ */ #include <pixman.h> +#include "scenefx/types/fx/shadow_data.h" #include <time.h> #include <wayland-server-core.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_damage_ring.h> -#include "types/fx/shadow_data.h" #include <wlr/types/wlr_linux_dmabuf_v1.h> #include <wlr/util/addon.h> #include <wlr/util/box.h> |