egl/wayland-egl: Fix for segfault in dri2_wl_destroy_surface.

[mesa.git] / src / egl / wayland / wayland-egl / wayland-egl.c

diff --git a/src/egl/wayland/wayland-egl/wayland-egl.c b/src/egl/wayland/wayland-egl/wayland-egl.c
index 891a497d1d1099c84a9eb5d27adffc73d6e5fc7e..4a4701a2de7f378703c9a5f36c6787789621cb17 100644 (file)
--- a/src/egl/wayland/wayland-egl/wayland-egl.c
+++ b/src/egl/wayland/wayland-egl/wayland-egl.c
@@ -1,46 +1,72 @@
-#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>
+/*
+ * Copyright © 2011 Kristian Høgsberg
+ * Copyright © 2011 Benjamin Franzke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Kristian Høgsberg <krh@bitplanet.net>
+ *    Benjamin Franzke <benjaminfranzke@googlemail.com>
+ */
 
-#include <dlfcn.h>
+#include <stdlib.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,
                     int width, int height,
                     int dx, int dy)
 {
+       if (width <= 0 || height <= 0)
+               return;
+
        egl_window->width  = width;
        egl_window->height = height;
        egl_window->dx     = dx;
        egl_window->dy     = dy;
+
+       if (egl_window->resize_callback)
+               egl_window->resize_callback(egl_window, egl_window->private);
 }
 
 WL_EGL_EXPORT struct wl_egl_window *
 wl_egl_window_create(struct wl_surface *surface,
-                    int width, int height,
-                    struct wl_visual *visual)
+                    int width, int height)
 {
        struct wl_egl_window *egl_window;
 
+       if (width <= 0 || height <= 0)
+               return NULL;
+
        egl_window = malloc(sizeof *egl_window);
        if (!egl_window)
                return NULL;
 
        egl_window->surface = surface;
-       egl_window->visual  = visual;
+       egl_window->private = NULL;
+       egl_window->resize_callback = NULL;
+       egl_window->destroy_window_callback = NULL;
        wl_egl_window_resize(egl_window, width, height, 0, 0);
        egl_window->attached_width  = 0;
        egl_window->attached_height = 0;
@@ -51,6 +77,8 @@ wl_egl_window_create(struct wl_surface *surface,
 WL_EGL_EXPORT void
 wl_egl_window_destroy(struct wl_egl_window *egl_window)
 {
+       if (egl_window->destroy_window_callback)
+               egl_window->destroy_window_callback(egl_window->private);
        free(egl_window);
 }
 
@@ -63,36 +91,3 @@ wl_egl_window_get_attached_size(struct wl_egl_window *egl_window,
        if (height)
                *height = egl_window->attached_height;
 }
-
-WL_EGL_EXPORT struct wl_egl_pixmap *
-wl_egl_pixmap_create(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->width   = width;
-       egl_pixmap->height  = height;
-       egl_pixmap->visual  = visual;
-
-       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_pixmap *egl_pixmap)
-{
-       return egl_pixmap->buffer;
-}