Mesa (master): wayland-egl: Remove left-over headers and struct
Kristian Høgsberg
krh at kemper.freedesktop.org
Tue May 31 19:15:35 UTC 2011
Module: Mesa
Branch: master
Commit: 5bf6cc95c1e3dc01dde2bd91fc0bd4eb02cddd40
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5bf6cc95c1e3dc01dde2bd91fc0bd4eb02cddd40
Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date: Tue May 31 11:13:57 2011 +0200
wayland-egl: Remove left-over headers and struct
---
src/egl/wayland/wayland-egl/wayland-egl-priv.h | 15 +--------------
src/egl/wayland/wayland-egl/wayland-egl.c | 13 -------------
2 files changed, 1 insertions(+), 27 deletions(-)
diff --git a/src/egl/wayland/wayland-egl/wayland-egl-priv.h b/src/egl/wayland/wayland-egl/wayland-egl-priv.h
index 7bb436a..179f5cf 100644
--- a/src/egl/wayland/wayland-egl/wayland-egl-priv.h
+++ b/src/egl/wayland/wayland-egl/wayland-egl-priv.h
@@ -12,20 +12,8 @@ extern "C" {
#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;
@@ -40,8 +28,7 @@ struct wl_egl_window {
};
struct wl_egl_pixmap {
- struct wl_egl_display *display;
- struct wl_visual *visual;
+ struct wl_visual *visual;
struct wl_buffer *buffer;
int width;
diff --git a/src/egl/wayland/wayland-egl/wayland-egl.c b/src/egl/wayland/wayland-egl/wayland-egl.c
index 3e1a9c4..c8f73ea 100644
--- a/src/egl/wayland/wayland-egl/wayland-egl.c
+++ b/src/egl/wayland/wayland-egl/wayland-egl.c
@@ -1,21 +1,8 @@
-#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>
WL_EGL_EXPORT void
wl_egl_window_resize(struct wl_egl_window *egl_window,
More information about the mesa-commit
mailing list