Merge pull request #1148 from emersion/rename-linux-dmabuf

linux-dmabuf: add v1 suffix

3 files changed, 11 insertions, 11 deletions

diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index d9add26a..2d28fa10 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -8,7 +8,7 @@
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_layer_shell.h>
-#include <wlr/types/wlr_linux_dmabuf.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_list.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
@@ -52,7 +52,7 @@ struct roots_desktop {
 	struct wlr_idle *idle;
 	struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
 	struct wlr_input_inhibit_manager *input_inhibit;
-	struct wlr_linux_dmabuf *linux_dmabuf;
+	struct wlr_linux_dmabuf_v1 *linux_dmabuf;
 	struct wlr_layer_shell *layer_shell;
 	struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard;
 	struct wlr_screencopy_manager_v1 *screencopy;
diff --git a/include/wlr/types/wlr_linux_dmabuf.h b/include/wlr/types/wlr_linux_dmabuf_v1.h
index 4a03170c..43bc8385 100644
--- a/include/wlr/types/wlr_linux_dmabuf.h
+++ b/include/wlr/types/wlr_linux_dmabuf_v1.h
@@ -5,7 +5,7 @@
 #include <wayland-server-protocol.h>
 #include <wlr/render/dmabuf.h>
 
-struct wlr_dmabuf_buffer {
+struct wlr_dmabuf_v1_buffer {
 	struct wlr_renderer *renderer;
 	struct wl_resource *buffer_resource;
 	struct wl_resource *params_resource;
@@ -17,24 +17,24 @@ struct wlr_dmabuf_buffer {
  * Returns true if the given resource was created via the linux-dmabuf
  * buffer protocol, false otherwise
  */
-bool wlr_dmabuf_resource_is_buffer(struct wl_resource *buffer_resource);
+bool wlr_dmabuf_v1_resource_is_buffer(struct wl_resource *buffer_resource);
 
 /**
  * Returns the wlr_dmabuf_buffer if the given resource was created
  * via the linux-dmabuf buffer protocol
  */
-struct wlr_dmabuf_buffer *wlr_dmabuf_buffer_from_buffer_resource(
+struct wlr_dmabuf_v1_buffer *wlr_dmabuf_v1_buffer_from_buffer_resource(
 	struct wl_resource *buffer_resource);
 
 /**
  * Returns the wlr_dmabuf_buffer if the given resource was created
  * via the linux-dmabuf params protocol
  */
-struct wlr_dmabuf_buffer *wlr_dmabuf_buffer_from_params_resource(
+struct wlr_dmabuf_v1_buffer *wlr_dmabuf_v1_buffer_from_params_resource(
 	struct wl_resource *params_resource);
 
 /* the protocol interface */
-struct wlr_linux_dmabuf {
+struct wlr_linux_dmabuf_v1 {
 	struct wl_global *global;
 	struct wlr_renderer *renderer;
 	struct wl_list resources;
@@ -50,18 +50,18 @@ struct wlr_linux_dmabuf {
 /**
  * Create linux-dmabuf interface
  */
-struct wlr_linux_dmabuf *wlr_linux_dmabuf_create(struct wl_display *display,
+struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_create(struct wl_display *display,
 	struct wlr_renderer *renderer);
 /**
  * Destroy the linux-dmabuf interface
  */
-void wlr_linux_dmabuf_destroy(struct wlr_linux_dmabuf *linux_dmabuf);
+void wlr_linux_dmabuf_v1_destroy(struct wlr_linux_dmabuf_v1 *linux_dmabuf);
 
 /**
  * Returns the wlr_linux_dmabuf if the given resource was created
  * via the linux_dmabuf protocol
  */
-struct wlr_linux_dmabuf *wlr_linux_dmabuf_from_resource(
+struct wlr_linux_dmabuf_v1 *wlr_linux_dmabuf_v1_from_resource(
 	struct wl_resource *resource);
 
 #endif
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 5084eb5a..c93ed2eb 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -6,7 +6,7 @@
 #include <time.h>
 #include <wayland-server.h>
 #include <wayland-util.h>
-#include <wlr/types/wlr_linux_dmabuf.h>
+#include <wlr/render/dmabuf.h>
 
 struct wlr_output_mode {
 	uint32_t flags; // enum wl_output_mode