aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend/drm/renderer.c1
-rw-r--r--include/render/wlr_texture.h15
-rw-r--r--include/wlr/render/wlr_texture.h10
-rw-r--r--render/wlr_texture.c1
-rw-r--r--types/wlr_buffer.c1
5 files changed, 10 insertions, 18 deletions
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 60dd9c77..5c38f8fb 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -18,7 +18,6 @@
#include "render/pixel_format.h"
#include "render/swapchain.h"
#include "render/wlr_renderer.h"
-#include "render/wlr_texture.h"
bool init_drm_renderer(struct wlr_drm_backend *drm,
struct wlr_drm_renderer *renderer) {
diff --git a/include/render/wlr_texture.h b/include/render/wlr_texture.h
deleted file mode 100644
index eb94824f..00000000
--- a/include/render/wlr_texture.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef RENDER_WLR_TEXTURE_H
-#define RENDER_WLR_TEXTURE_H
-
-#include <wlr/render/wlr_texture.h>
-
-/**
- * Create a new texture from a buffer.
- *
- * Should not be called in a rendering block like renderer_begin()/end() or
- * between attaching a renderer to an output and committing it.
- */
-struct wlr_texture *wlr_texture_from_buffer(struct wlr_renderer *renderer,
- struct wlr_buffer *buffer);
-
-#endif
diff --git a/include/wlr/render/wlr_texture.h b/include/wlr/render/wlr_texture.h
index aa905238..3495c443 100644
--- a/include/wlr/render/wlr_texture.h
+++ b/include/wlr/render/wlr_texture.h
@@ -13,6 +13,7 @@
#include <wayland-server-core.h>
#include <wlr/render/dmabuf.h>
+struct wlr_buffer;
struct wlr_renderer;
struct wlr_texture_impl;
@@ -73,4 +74,13 @@ bool wlr_texture_write_pixels(struct wlr_texture *texture,
*/
void wlr_texture_destroy(struct wlr_texture *texture);
+/**
+ * Create a new texture from a buffer.
+ *
+ * Should not be called in a rendering block like renderer_begin()/end() or
+ * between attaching a renderer to an output and committing it.
+ */
+struct wlr_texture *wlr_texture_from_buffer(struct wlr_renderer *renderer,
+ struct wlr_buffer *buffer);
+
#endif
diff --git a/render/wlr_texture.c b/render/wlr_texture.c
index 9e825449..c4563dd6 100644
--- a/render/wlr_texture.c
+++ b/render/wlr_texture.c
@@ -4,7 +4,6 @@
#include <wlr/render/interface.h>
#include <wlr/render/wlr_texture.h>
#include "types/wlr_buffer.h"
-#include "render/wlr_texture.h"
void wlr_texture_init(struct wlr_texture *texture,
const struct wlr_texture_impl *impl, uint32_t width, uint32_t height) {
diff --git a/types/wlr_buffer.c b/types/wlr_buffer.c
index 80646f47..94b42d4a 100644
--- a/types/wlr_buffer.c
+++ b/types/wlr_buffer.c
@@ -7,7 +7,6 @@
#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/util/log.h>
#include "render/pixel_format.h"
-#include "render/wlr_texture.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"