configure.ac: split the wayland client/server confusion

[mesa.git] / src / egl / wayland / wayland-drm / wayland-drm.h

diff --git a/src/egl/wayland/wayland-drm/wayland-drm.h b/src/egl/wayland/wayland-drm/wayland-drm.h
index 4324b591425fda4130bc99d87a5640ceb6ec02b2..77e8d27304245ad1ae2c71fb651f892e08554f0e 100644 (file)
--- a/src/egl/wayland/wayland-drm/wayland-drm.h
+++ b/src/egl/wayland/wayland-drm/wayland-drm.h
@@ -1,34 +1,43 @@
 #ifndef WAYLAND_DRM_H
 #define WAYLAND_DRM_H
 
-#include "egldisplay.h"
-#include "eglimage.h"
-
 #include <wayland-server.h>
 
+struct wl_display;
 struct wl_drm;
+struct wl_resource;
+
+struct wl_drm_buffer {
+       struct wl_resource *resource;
+       struct wl_drm *drm;
+       int32_t width, height;
+       uint32_t format;
+        const void *driver_format;
+        int32_t offset[3];
+        int32_t stride[3];
+       void *driver_buffer;
+};
 
 struct wayland_drm_callbacks {
        int (*authenticate)(void *user_data, uint32_t id);
 
-       void *(*reference_buffer)(void *user_data, uint32_t name,
-                                 int32_t width, int32_t height,
-                                 uint32_t stride, struct wl_visual *visual);
+        void (*reference_buffer)(void *user_data, uint32_t name, int fd,
+                                 struct wl_drm_buffer *buffer);
 
-       void (*release_buffer)(void *user_data, void *buffer);
+       void (*release_buffer)(void *user_data, struct wl_drm_buffer *buffer);
 };
 
+enum { WAYLAND_DRM_PRIME = 0x01 };
+
+struct wl_drm_buffer *
+wayland_drm_buffer_get(struct wl_drm *drm, struct wl_resource *resource);
+
 struct wl_drm *
 wayland_drm_init(struct wl_display *display, char *device_name,
-                struct wayland_drm_callbacks *callbacks, void *user_data);
+                struct wayland_drm_callbacks *callbacks, void *user_data,
+                 uint32_t flags);
 
 void
 wayland_drm_uninit(struct wl_drm *drm);
 
-int
-wayland_buffer_is_drm(struct wl_buffer *buffer);
-
-void *
-wayland_drm_buffer_get_buffer(struct wl_buffer *buffer);
-
 #endif