aboutsummaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorsghctoma <sghctoma@gmail.com>2018-09-02 18:32:31 +0200
committersghctoma <sghctoma@gmail.com>2018-09-02 18:32:31 +0200
commit3b2b8c18446bb98ec0e5eea46fb1212b7bf64445 (patch)
tree1efb3ccee04a7589a1c963b3cace215ca8236c56 /render
parent2bd6fbf20ebb055d4871ffb8eedefa7d7aa60ee8 (diff)
parent95d05acda511e8559ab87a3d8956ee942ca1999e (diff)
Merge remote-tracking branch 'upstream/master' into fix-freebsd-direct-session
Diffstat (limited to 'render')
-rw-r--r--render/wlr_renderer.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c
index 6c2b9fbb..31bf2b18 100644
--- a/render/wlr_renderer.c
+++ b/render/wlr_renderer.c
@@ -1,10 +1,11 @@
#include <assert.h>
#include <stdbool.h>
#include <stdlib.h>
+#include <wlr/render/gles2.h>
#include <wlr/render/interface.h>
#include <wlr/render/wlr_renderer.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/types/wlr_matrix.h>
-#include <wlr/render/gles2.h>
#include <wlr/util/log.h>
#include "util/signal.h"
@@ -176,6 +177,10 @@ void wlr_renderer_init_wl_display(struct wlr_renderer *r,
}
}
+ if (r->impl->texture_from_dmabuf) {
+ wlr_linux_dmabuf_v1_create(wl_display, r);
+ }
+
if (r->impl->init_wl_display) {
r->impl->init_wl_display(r, wl_display);
}