summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2012-10-16 14:04:02 -0400
committerKristian Høgsberg <krh@bitplanet.net>2012-10-17 16:32:13 -0400
commit2b8e90a33826dcd30b0cbbf464fbd191bf299d38 (patch)
tree6683ce6370174a6c90ec20611a3a3dec78a03282
parent0229e3ae41be109ac423b2eb2ddf79e24b799d60 (diff)
wayland: Remove 0.85 compatibility #ifdefs
-rw-r--r--src/egl/wayland/wayland-drm/wayland-drm.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/src/egl/wayland/wayland-drm/wayland-drm.c b/src/egl/wayland/wayland-drm/wayland-drm.c
index 45b307f3a88..d02aab66324 100644
--- a/src/egl/wayland/wayland-drm/wayland-drm.c
+++ b/src/egl/wayland/wayland-drm/wayland-drm.c
@@ -36,17 +36,6 @@
#include "wayland-drm.h"
#include "wayland-drm-server-protocol.h"
-/* Git master of Wayland is moving towards a stable version of the
- * protocol, but breaking from 0.85 in the process. For the time
- * being, it's convenient to be able to build Mesa against both master
- * and 0.85.x of Wayland. To make this work we'll do a compile-time
- * version check and work around the difference in API and protocol */
-#if defined (WAYLAND_VERSION_MAJOR) && \
- WAYLAND_VERSION_MAJOR == 0 && \
- WAYLAND_VERSION_MINOR == 85
-#define HAS_WAYLAND_0_85
-#endif
-
struct wl_drm {
struct wl_display *display;
@@ -69,25 +58,10 @@ destroy_buffer(struct wl_resource *resource)
static void
buffer_destroy(struct wl_client *client, struct wl_resource *resource)
{
-#ifdef HAS_WAYLAND_0_85
- wl_resource_destroy(resource, 0);
-#else
wl_resource_destroy(resource);
-#endif
-}
-
-#ifdef HAS_WAYLAND_0_85
-static void
-buffer_damage(struct wl_client *client, struct wl_resource *buffer,
- int32_t x, int32_t y, int32_t width, int32_t height)
-{
}
-#endif
const static struct wl_buffer_interface drm_buffer_interface = {
-#ifdef HAS_WAYLAND_0_85
- buffer_damage,
-#endif
buffer_destroy
};