egl/wayland: Move wayland-egl into a subdir
authorBenjamin Franzke <benjaminfranzke@googlemail.com>
Thu, 3 Mar 2011 10:05:03 +0000 (11:05 +0100)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 4 Mar 2011 21:36:37 +0000 (16:36 -0500)
This hopefully fixes wayland-egl's dependency
resolution for autogenerated wayland-drm headers.

src/egl/drivers/dri2/Makefile
src/egl/wayland/Makefile
src/egl/wayland/wayland-egl-priv.h [deleted file]
src/egl/wayland/wayland-egl.c [deleted file]
src/egl/wayland/wayland-egl.pc.in [deleted file]
src/egl/wayland/wayland-egl/Makefile [new file with mode: 0644]
src/egl/wayland/wayland-egl/wayland-egl-priv.h [new file with mode: 0644]
src/egl/wayland/wayland-egl/wayland-egl.c [new file with mode: 0644]
src/egl/wayland/wayland-egl/wayland-egl.pc.in [new file with mode: 0644]
src/gallium/state_trackers/egl/Makefile

index eac599e6745fa896948ef97707103bfdc1209388..4783975852a28e0914139a3f9615b9be30932c5a 100644 (file)
@@ -27,7 +27,7 @@ endif
 ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
 EGL_SOURCES += platform_wayland.c
 EGL_INCLUDES += -DHAVE_WAYLAND_PLATFORM $(WAYLAND_CFLAGS) \
-               -I$(TOP)/src/egl/wayland \
+               -I$(TOP)/src/egl/wayland/wayland-egl \
                -I$(TOP)/src/egl/wayland/wayland-drm
 EGL_LIBS += $(WAYLAND_LIBS) \
            $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
index f484ff8989a4cb616bc8184a99fd0330dfa6aca3..c38a1302f188bb7f87f9483e1bcd4b10217595bb 100644 (file)
@@ -3,62 +3,10 @@
 TOP = ../../..
 include $(TOP)/configs/current
 
-INCLUDE_DIRS = -I$(TOP)/include
+SUBDIRS = wayland-drm wayland-egl
 
-HEADERS = wayland-egl-priv.h
-SOURCES = wayland-egl.c
+default: subdirs
 
-OBJECTS = $(SOURCES:.c=.o)
-
-LOCAL_CFLAGS = -I$(TOP)/include/EGL \
-              -I$(TOP)/src/egl/wayland/wayland-drm \
-              $(LIBDRM_CFLAGS) \
-              $(WAYLAND_CFLAGS)
-
-LOCAL_LIBS =
-
-SUBDIRS = wayland-drm
-
-.c.o:
-       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
-
-
-default: subdirs depend library
-
-# wayland-egl Library
-library: $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME)
-
-$(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME): $(OBJECTS) $(LOCAL_LIBS)
-       $(MKLIB) -o $(WAYLAND_EGL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-               -L$(TOP)/$(LIB_DIR) $(WAYLAND_EGL_LIB_DEPS) \
-               $(OBJECTS) $(LOCAL_LIBS)
-
-PKG_CONFIG_DIR = $(INSTALL_LIB_DIR)/pkgconfig
-
-gl_pcedit = sed \
-       -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
-       -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
-       -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
-       -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
-       -e 's,@WAYLAND_EGL_PC_REQ_PRIV@,$(WAYLAND_EGL_PC_REQ_PRIV),' \
-       -e 's,@WAYLAND_EGL_PC_LIB_PRIV@,$(WAYLAND_EGL_PC_LIB_PRIV),' \
-       -e 's,@WAYLAND_EGL_PC_CFLAGS@,$(WAYLAND_EGL_PC_CFLAGS),' \
-       -e 's,@WAYLAND_EGL_LIB@,$(WAYLAND_EGL_LIB),'
-
-wayland-egl.pc: wayland-egl.pc.in
-       $(gl_pcedit) $< > $@
-
-install: default wayland-egl.pc
-       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
-       $(MINSTALL) $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_GLOB) \
-               $(DESTDIR)$(INSTALL_LIB_DIR)
-       $(INSTALL) -d $(DESTDIR)$(PKG_CONFIG_DIR)
-       $(INSTALL) -m 644 wayland-egl.pc $(DESTDIR)$(PKG_CONFIG_DIR)
-
-clean:
-       -rm -f *.o
-       -rm -f depend depend.bak
 
 subdirs:
        @for dir in $(SUBDIRS) ; do \
@@ -67,13 +15,16 @@ subdirs:
                fi \
        done
 
-depend: $(SOURCES) $(HEADERS)
-       @ echo "running $(MKDEP)"
-       @ rm -f depend
-       @ touch depend
-       $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
-               $(SOURCES) $(HEADERS) > /dev/null 2>/dev/null
-
+install:
+       @for dir in $(SUBDIRS) ; do \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE) install) || exit 1 ; \
+               fi \
+       done
 
--include depend
-# DO NOT DELETE
+clean:
+       -@for dir in $(SUBDIRS) ; do \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE) clean) ; \
+               fi \
+       done
diff --git a/src/egl/wayland/wayland-egl-priv.h b/src/egl/wayland/wayland-egl-priv.h
deleted file mode 100644 (file)
index 38b21c2..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _WAYLAND_EGL_PRIV_H
-#define _WAYLAND_EGL_PRIV_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* GCC visibility */
-#if defined(__GNUC__) && __GNUC__ >= 4
-#define WL_EGL_EXPORT __attribute__ ((visibility("default")))
-#else
-#define WL_EGL_EXPORT
-#endif
-
-#include <stdbool.h>
-#include <wayland-client.h>
-
-struct wl_egl_display {
-       struct wl_display *display;
-
-       struct wl_drm *drm;
-       int fd;
-       char *device_name;
-       bool authenticated;
-
-       void (*glFlush)(void);
-};
-
-struct wl_egl_window {
-       struct wl_surface *surface;
-       struct wl_visual *visual;
-
-       int width;
-       int height;
-       int dx;
-       int dy;
-
-       int attached_width;
-       int attached_height;
-};
-
-struct wl_egl_pixmap {
-       struct wl_egl_display *display;
-       struct wl_visual      *visual;
-
-       int name;
-       int width;
-       int height;
-       int stride;
-
-       void (*destroy) (struct wl_egl_pixmap *egl_pixmap);
-
-       void *driver_private;
-};
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/egl/wayland/wayland-egl.c b/src/egl/wayland/wayland-egl.c
deleted file mode 100644 (file)
index 2c84bec..0000000
+++ /dev/null
@@ -1,226 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <dlfcn.h>
-
-#include <wayland-client.h>
-#include "wayland-egl.h"
-#include "wayland-egl-priv.h"
-#include "wayland-drm-client-protocol.h"
-#include <xf86drm.h>
-
-static void
-drm_handle_device(void *data, struct wl_drm *drm, const char *device)
-{
-       struct wl_egl_display *egl_display = data;
-       drm_magic_t magic;
-
-       egl_display->device_name = strdup(device);
-
-       egl_display->fd = open(egl_display->device_name, O_RDWR);
-
-       if (egl_display->fd == -1) {
-               fprintf(stderr, "wayland-egl: could not open %s (%s)",
-                       egl_display->device_name, strerror(errno));
-               return;
-       }
-       drmGetMagic(egl_display->fd, &magic);
-       wl_drm_authenticate(egl_display->drm, magic);
-}
-
-static void
-drm_handle_authenticated(void *data, struct wl_drm *drm)
-{
-       struct wl_egl_display *egl_display = data;
-
-       egl_display->authenticated = true;
-}
-
-static const struct wl_drm_listener drm_listener = {
-       drm_handle_device,
-       drm_handle_authenticated
-};
-
-static void
-wl_display_handle_global(struct wl_display *display, uint32_t id,
-                        const char *interface, uint32_t version, void *data)
-{
-       struct wl_egl_display *egl_display = data;
-
-       if (strcmp(interface, "drm") == 0) {
-               egl_display->drm = wl_drm_create(display, id);
-               wl_drm_add_listener(egl_display->drm, &drm_listener,
-                                   egl_display);
-       }
-}
-
-/* stolen from egl_dri2:dri2_load() */
-static void *
-get_flush_address() {
-       void *handle;
-       void *(*get_proc_address)(const char *procname);
-
-       handle = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);
-       if (handle) {
-               get_proc_address = (void* (*)(const char *))
-                       dlsym(handle, "_glapi_get_proc_address");
-               /* no need to keep a reference */
-               dlclose(handle);
-       }
-
-       /*
-        * If glapi is not available, loading DRI drivers will fail.  Ideally, we
-        * should load one of libGL, libGLESv1_CM, or libGLESv2 and go on.  But if
-        * the app has loaded another one of them with RTLD_LOCAL, there may be
-        * unexpected behaviors later because there will be two copies of glapi
-        * (with global variables of the same names!) in the memory.
-        */
-       if (!get_proc_address) {
-               fprintf(stderr, "failed to find _glapi_get_proc_address");
-               return NULL;
-       }
-
-       return get_proc_address("glFlush");
-}
-
-WL_EGL_EXPORT struct wl_egl_display *
-wl_egl_display_create(struct wl_display *display)
-{
-       struct wl_egl_display *egl_display;
-
-       egl_display = malloc(sizeof *egl_display);
-       if (!egl_display)
-               return NULL;
-
-       egl_display->display = display;
-       egl_display->drm = NULL;
-       egl_display->fd = -1;
-       egl_display->device_name = NULL;
-       egl_display->authenticated = false;
-
-       egl_display->glFlush = (void (*)(void)) get_flush_address();
-
-       wl_display_add_global_listener(display, wl_display_handle_global,
-                                      egl_display);
-
-       return egl_display;
-}
-
-WL_EGL_EXPORT void
-wl_egl_display_destroy(struct wl_egl_display *egl_display)
-{
-
-       free(egl_display->device_name);
-       close(egl_display->fd);
-
-       wl_drm_destroy(egl_display->drm);
-
-       free(egl_display);
-}
-
-WL_EGL_EXPORT void
-wl_egl_window_resize(struct wl_egl_window *egl_window,
-                    int width, int height,
-                    int dx, int dy)
-{
-       egl_window->width  = width;
-       egl_window->height = height;
-       egl_window->dx     = dx;
-       egl_window->dy     = dy;
-}
-
-WL_EGL_EXPORT struct wl_egl_window *
-wl_egl_window_create(struct wl_egl_display *egl_display,
-                    struct wl_surface *surface,
-                    int width, int height,
-                    struct wl_visual *visual)
-{
-       struct wl_egl_window *egl_window;
-
-       egl_window = malloc(sizeof *egl_window);
-       if (!egl_window)
-               return NULL;
-
-       egl_window->surface = surface;
-       egl_window->visual  = visual;
-       wl_egl_window_resize(egl_window, width, height, 0, 0);
-       egl_window->attached_width  = 0;
-       egl_window->attached_height = 0;
-       
-       return egl_window;
-}
-
-WL_EGL_EXPORT void
-wl_egl_window_destroy(struct wl_egl_window *egl_window)
-{
-       free(egl_window);
-}
-
-WL_EGL_EXPORT void
-wl_egl_window_get_attached_size(struct wl_egl_window *egl_window,
-                               int *width, int *height)
-{
-       if (width)
-               *width = egl_window->attached_width;
-       if (height)
-               *height = egl_window->attached_height;
-}
-
-WL_EGL_EXPORT struct wl_egl_pixmap *
-wl_egl_pixmap_create(struct wl_egl_display *egl_display,
-                    int width, int height,
-                    struct wl_visual *visual, uint32_t flags)
-{
-       struct wl_egl_pixmap *egl_pixmap;
-
-       egl_pixmap = malloc(sizeof *egl_pixmap);
-       if (egl_pixmap == NULL)
-               return NULL;
-
-       egl_pixmap->display = egl_display;
-       egl_pixmap->width   = width;
-       egl_pixmap->height  = height;
-       egl_pixmap->visual  = visual;
-       egl_pixmap->name    = 0;
-       egl_pixmap->stride  = 0;
-
-       egl_pixmap->destroy = NULL;
-
-       return egl_pixmap;
-}
-
-WL_EGL_EXPORT void
-wl_egl_pixmap_destroy(struct wl_egl_pixmap *egl_pixmap)
-{
-       if (egl_pixmap->destroy)
-               egl_pixmap->destroy(egl_pixmap);
-       free(egl_pixmap);
-}
-
-WL_EGL_EXPORT struct wl_buffer *
-wl_egl_pixmap_create_buffer(struct wl_egl_display *egl_display,
-                           struct wl_egl_pixmap *egl_pixmap)
-{
-       if (egl_pixmap->name == 0)
-               return NULL;
-
-       return wl_drm_create_buffer(egl_display->drm, egl_pixmap->name,
-                                   egl_pixmap->width, egl_pixmap->height,
-                                   egl_pixmap->stride, egl_pixmap->visual);
-}
-
-WL_EGL_EXPORT void
-wl_egl_pixmap_flush(struct wl_egl_display *egl_display,
-                   struct wl_egl_pixmap *egl_pixmap)
-{
-       if (egl_display->glFlush)
-               egl_display->glFlush();
-}
diff --git a/src/egl/wayland/wayland-egl.pc.in b/src/egl/wayland/wayland-egl.pc.in
deleted file mode 100644 (file)
index 3c2067c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@INSTALL_DIR@
-exec_prefix=${prefix}
-libdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
-
-Name: wayland-egl
-Description: Mesa wayland-egl library
-Requires.private: @WAYLAND_EGL_PC_REQ_PRIV@
-Version: @VERSION@
-Libs: -L${libdir} -l@WAYLAND_EGL_LIB@
-Libs.private: @WAYLAND_EGL_PC_LIB_PRIV@
-Cflags: -I${includedir} @WAYLAND_EGL_PC_CFLAGS@
diff --git a/src/egl/wayland/wayland-egl/Makefile b/src/egl/wayland/wayland-egl/Makefile
new file mode 100644 (file)
index 0000000..b9d13dc
--- /dev/null
@@ -0,0 +1,71 @@
+# src/egl/wayland/wayland-egl/Makefile
+
+TOP = ../../../..
+include $(TOP)/configs/current
+
+INCLUDE_DIRS = -I$(TOP)/include \
+              -I$(TOP)/include/EGL \
+              -I$(TOP)/src/egl/wayland/wayland-drm
+
+
+HEADERS = wayland-egl-priv.h
+SOURCES = wayland-egl.c
+
+OBJECTS = $(SOURCES:.c=.o)
+
+LOCAL_CFLAGS = $(LIBDRM_CFLAGS) \
+              $(WAYLAND_CFLAGS)
+
+LOCAL_LIBS =
+
+.c.o:
+       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@
+
+
+default: depend library
+
+# wayland-egl Library
+library: $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME)
+
+$(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME): $(OBJECTS) $(LOCAL_LIBS)
+       $(MKLIB) -o $(WAYLAND_EGL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+               -L$(TOP)/$(LIB_DIR) $(WAYLAND_EGL_LIB_DEPS) \
+               $(OBJECTS) $(LOCAL_LIBS)
+
+PKG_CONFIG_DIR = $(INSTALL_LIB_DIR)/pkgconfig
+
+gl_pcedit = sed \
+       -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \
+       -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \
+       -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
+       -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
+       -e 's,@WAYLAND_EGL_PC_REQ_PRIV@,$(WAYLAND_EGL_PC_REQ_PRIV),' \
+       -e 's,@WAYLAND_EGL_PC_LIB_PRIV@,$(WAYLAND_EGL_PC_LIB_PRIV),' \
+       -e 's,@WAYLAND_EGL_PC_CFLAGS@,$(WAYLAND_EGL_PC_CFLAGS),' \
+       -e 's,@WAYLAND_EGL_LIB@,$(WAYLAND_EGL_LIB),'
+
+wayland-egl.pc: wayland-egl.pc.in
+       $(gl_pcedit) $< > $@
+
+install: default wayland-egl.pc
+       $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(MINSTALL) $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_GLOB) \
+               $(DESTDIR)$(INSTALL_LIB_DIR)
+       $(INSTALL) -d $(DESTDIR)$(PKG_CONFIG_DIR)
+       $(INSTALL) -m 644 wayland-egl.pc $(DESTDIR)$(PKG_CONFIG_DIR)
+
+clean:
+       -rm -f *.o
+       -rm -f depend depend.bak
+
+depend: $(SOURCES) $(HEADERS)
+       @ echo "running $(MKDEP)"
+       @ rm -f depend
+       @ touch depend
+       $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
+               $(SOURCES) $(HEADERS) > /dev/null 2>/dev/null
+
+
+-include depend
+# DO NOT DELETE
diff --git a/src/egl/wayland/wayland-egl/wayland-egl-priv.h b/src/egl/wayland/wayland-egl/wayland-egl-priv.h
new file mode 100644 (file)
index 0000000..38b21c2
--- /dev/null
@@ -0,0 +1,60 @@
+#ifndef _WAYLAND_EGL_PRIV_H
+#define _WAYLAND_EGL_PRIV_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* GCC visibility */
+#if defined(__GNUC__) && __GNUC__ >= 4
+#define WL_EGL_EXPORT __attribute__ ((visibility("default")))
+#else
+#define WL_EGL_EXPORT
+#endif
+
+#include <stdbool.h>
+#include <wayland-client.h>
+
+struct wl_egl_display {
+       struct wl_display *display;
+
+       struct wl_drm *drm;
+       int fd;
+       char *device_name;
+       bool authenticated;
+
+       void (*glFlush)(void);
+};
+
+struct wl_egl_window {
+       struct wl_surface *surface;
+       struct wl_visual *visual;
+
+       int width;
+       int height;
+       int dx;
+       int dy;
+
+       int attached_width;
+       int attached_height;
+};
+
+struct wl_egl_pixmap {
+       struct wl_egl_display *display;
+       struct wl_visual      *visual;
+
+       int name;
+       int width;
+       int height;
+       int stride;
+
+       void (*destroy) (struct wl_egl_pixmap *egl_pixmap);
+
+       void *driver_private;
+};
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/egl/wayland/wayland-egl/wayland-egl.c b/src/egl/wayland/wayland-egl/wayland-egl.c
new file mode 100644 (file)
index 0000000..2c84bec
--- /dev/null
@@ -0,0 +1,226 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+#include <errno.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include <dlfcn.h>
+
+#include <wayland-client.h>
+#include "wayland-egl.h"
+#include "wayland-egl-priv.h"
+#include "wayland-drm-client-protocol.h"
+#include <xf86drm.h>
+
+static void
+drm_handle_device(void *data, struct wl_drm *drm, const char *device)
+{
+       struct wl_egl_display *egl_display = data;
+       drm_magic_t magic;
+
+       egl_display->device_name = strdup(device);
+
+       egl_display->fd = open(egl_display->device_name, O_RDWR);
+
+       if (egl_display->fd == -1) {
+               fprintf(stderr, "wayland-egl: could not open %s (%s)",
+                       egl_display->device_name, strerror(errno));
+               return;
+       }
+       drmGetMagic(egl_display->fd, &magic);
+       wl_drm_authenticate(egl_display->drm, magic);
+}
+
+static void
+drm_handle_authenticated(void *data, struct wl_drm *drm)
+{
+       struct wl_egl_display *egl_display = data;
+
+       egl_display->authenticated = true;
+}
+
+static const struct wl_drm_listener drm_listener = {
+       drm_handle_device,
+       drm_handle_authenticated
+};
+
+static void
+wl_display_handle_global(struct wl_display *display, uint32_t id,
+                        const char *interface, uint32_t version, void *data)
+{
+       struct wl_egl_display *egl_display = data;
+
+       if (strcmp(interface, "drm") == 0) {
+               egl_display->drm = wl_drm_create(display, id);
+               wl_drm_add_listener(egl_display->drm, &drm_listener,
+                                   egl_display);
+       }
+}
+
+/* stolen from egl_dri2:dri2_load() */
+static void *
+get_flush_address() {
+       void *handle;
+       void *(*get_proc_address)(const char *procname);
+
+       handle = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);
+       if (handle) {
+               get_proc_address = (void* (*)(const char *))
+                       dlsym(handle, "_glapi_get_proc_address");
+               /* no need to keep a reference */
+               dlclose(handle);
+       }
+
+       /*
+        * If glapi is not available, loading DRI drivers will fail.  Ideally, we
+        * should load one of libGL, libGLESv1_CM, or libGLESv2 and go on.  But if
+        * the app has loaded another one of them with RTLD_LOCAL, there may be
+        * unexpected behaviors later because there will be two copies of glapi
+        * (with global variables of the same names!) in the memory.
+        */
+       if (!get_proc_address) {
+               fprintf(stderr, "failed to find _glapi_get_proc_address");
+               return NULL;
+       }
+
+       return get_proc_address("glFlush");
+}
+
+WL_EGL_EXPORT struct wl_egl_display *
+wl_egl_display_create(struct wl_display *display)
+{
+       struct wl_egl_display *egl_display;
+
+       egl_display = malloc(sizeof *egl_display);
+       if (!egl_display)
+               return NULL;
+
+       egl_display->display = display;
+       egl_display->drm = NULL;
+       egl_display->fd = -1;
+       egl_display->device_name = NULL;
+       egl_display->authenticated = false;
+
+       egl_display->glFlush = (void (*)(void)) get_flush_address();
+
+       wl_display_add_global_listener(display, wl_display_handle_global,
+                                      egl_display);
+
+       return egl_display;
+}
+
+WL_EGL_EXPORT void
+wl_egl_display_destroy(struct wl_egl_display *egl_display)
+{
+
+       free(egl_display->device_name);
+       close(egl_display->fd);
+
+       wl_drm_destroy(egl_display->drm);
+
+       free(egl_display);
+}
+
+WL_EGL_EXPORT void
+wl_egl_window_resize(struct wl_egl_window *egl_window,
+                    int width, int height,
+                    int dx, int dy)
+{
+       egl_window->width  = width;
+       egl_window->height = height;
+       egl_window->dx     = dx;
+       egl_window->dy     = dy;
+}
+
+WL_EGL_EXPORT struct wl_egl_window *
+wl_egl_window_create(struct wl_egl_display *egl_display,
+                    struct wl_surface *surface,
+                    int width, int height,
+                    struct wl_visual *visual)
+{
+       struct wl_egl_window *egl_window;
+
+       egl_window = malloc(sizeof *egl_window);
+       if (!egl_window)
+               return NULL;
+
+       egl_window->surface = surface;
+       egl_window->visual  = visual;
+       wl_egl_window_resize(egl_window, width, height, 0, 0);
+       egl_window->attached_width  = 0;
+       egl_window->attached_height = 0;
+       
+       return egl_window;
+}
+
+WL_EGL_EXPORT void
+wl_egl_window_destroy(struct wl_egl_window *egl_window)
+{
+       free(egl_window);
+}
+
+WL_EGL_EXPORT void
+wl_egl_window_get_attached_size(struct wl_egl_window *egl_window,
+                               int *width, int *height)
+{
+       if (width)
+               *width = egl_window->attached_width;
+       if (height)
+               *height = egl_window->attached_height;
+}
+
+WL_EGL_EXPORT struct wl_egl_pixmap *
+wl_egl_pixmap_create(struct wl_egl_display *egl_display,
+                    int width, int height,
+                    struct wl_visual *visual, uint32_t flags)
+{
+       struct wl_egl_pixmap *egl_pixmap;
+
+       egl_pixmap = malloc(sizeof *egl_pixmap);
+       if (egl_pixmap == NULL)
+               return NULL;
+
+       egl_pixmap->display = egl_display;
+       egl_pixmap->width   = width;
+       egl_pixmap->height  = height;
+       egl_pixmap->visual  = visual;
+       egl_pixmap->name    = 0;
+       egl_pixmap->stride  = 0;
+
+       egl_pixmap->destroy = NULL;
+
+       return egl_pixmap;
+}
+
+WL_EGL_EXPORT void
+wl_egl_pixmap_destroy(struct wl_egl_pixmap *egl_pixmap)
+{
+       if (egl_pixmap->destroy)
+               egl_pixmap->destroy(egl_pixmap);
+       free(egl_pixmap);
+}
+
+WL_EGL_EXPORT struct wl_buffer *
+wl_egl_pixmap_create_buffer(struct wl_egl_display *egl_display,
+                           struct wl_egl_pixmap *egl_pixmap)
+{
+       if (egl_pixmap->name == 0)
+               return NULL;
+
+       return wl_drm_create_buffer(egl_display->drm, egl_pixmap->name,
+                                   egl_pixmap->width, egl_pixmap->height,
+                                   egl_pixmap->stride, egl_pixmap->visual);
+}
+
+WL_EGL_EXPORT void
+wl_egl_pixmap_flush(struct wl_egl_display *egl_display,
+                   struct wl_egl_pixmap *egl_pixmap)
+{
+       if (egl_display->glFlush)
+               egl_display->glFlush();
+}
diff --git a/src/egl/wayland/wayland-egl/wayland-egl.pc.in b/src/egl/wayland/wayland-egl/wayland-egl.pc.in
new file mode 100644 (file)
index 0000000..3c2067c
--- /dev/null
@@ -0,0 +1,12 @@
+prefix=@INSTALL_DIR@
+exec_prefix=${prefix}
+libdir=@INSTALL_LIB_DIR@
+includedir=@INSTALL_INC_DIR@
+
+Name: wayland-egl
+Description: Mesa wayland-egl library
+Requires.private: @WAYLAND_EGL_PC_REQ_PRIV@
+Version: @VERSION@
+Libs: -L${libdir} -l@WAYLAND_EGL_LIB@
+Libs.private: @WAYLAND_EGL_PC_LIB_PRIV@
+Cflags: -I${includedir} @WAYLAND_EGL_PC_CFLAGS@
index 686432140608bf1e684c375d7e361d2d506a591b..53673a78a944819f93b7e86449a6fe696dc67db2 100644 (file)
@@ -25,7 +25,7 @@ x11_OBJECTS = $(x11_SOURCES:.c=.o)
 
 wayland_INCLUDES = \
        -I$(TOP)/src/gallium/winsys \
-       -I$(TOP)/src/egl/wayland \
+       -I$(TOP)/src/egl/wayland/wayland-egl \
        -I$(TOP)/src/egl/wayland/wayland-drm \
        $(shell pkg-config --cflags-only-I libdrm wayland-client)