src/video/wayland/SDL_waylandwindow.c
changeset 8104 2e4f1bd21196
parent 8082 5b83ad3f01ac
child 8116 f7c2f71251e5
     1.1 --- a/src/video/wayland/SDL_waylandwindow.c	Wed Jan 08 14:53:08 2014 -0500
     1.2 +++ b/src/video/wayland/SDL_waylandwindow.c	Thu Jan 09 13:56:21 2014 -0300
     1.3 @@ -19,7 +19,7 @@
     1.4    3. This notice may not be removed or altered from any source distribution.
     1.5  */
     1.6  
     1.7 -#include "SDL_config.h"
     1.8 +#include "../../SDL_internal.h"
     1.9  
    1.10  #include "../SDL_sysvideo.h"
    1.11  #include "../../events/SDL_windowevents_c.h"
    1.12 @@ -104,7 +104,7 @@
    1.13      else
    1.14          wl_shell_surface_set_toplevel(wind->shell_surface);
    1.15  
    1.16 -    wayland_schedule_write(_this->driverdata);
    1.17 +    WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
    1.18  }
    1.19  
    1.20  void
    1.21 @@ -120,7 +120,7 @@
    1.22      else
    1.23          wl_shell_surface_set_toplevel(wind->shell_surface);
    1.24  
    1.25 -    wayland_schedule_write(_this->driverdata);
    1.26 +    WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
    1.27  }
    1.28  
    1.29  int Wayland_CreateWindow(_THIS, SDL_Window *window)
    1.30 @@ -162,7 +162,7 @@
    1.31                  c->surface_extension, data->surface);
    1.32      }
    1.33  #endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
    1.34 -    data->egl_window = wl_egl_window_create(data->surface,
    1.35 +    data->egl_window = WAYLAND_wl_egl_window_create(data->surface,
    1.36                                              window->w, window->h);
    1.37  
    1.38      /* Create the GLES window surface */
    1.39 @@ -192,7 +192,7 @@
    1.40      wl_surface_set_opaque_region(data->surface, region);
    1.41      wl_region_destroy(region);
    1.42  
    1.43 -    wayland_schedule_write(c);
    1.44 +    WAYLAND_wl_display_flush(c->display);
    1.45  
    1.46      return 0;
    1.47  }
    1.48 @@ -203,9 +203,9 @@
    1.49      SDL_WindowData *wind = window->driverdata;
    1.50      struct wl_region *region;
    1.51  
    1.52 -    wl_egl_window_resize(wind->egl_window, window->w, window->h, 0, 0);
    1.53 +    WAYLAND_wl_egl_window_resize(wind->egl_window, window->w, window->h, 0, 0);
    1.54  
    1.55 -    region = wl_compositor_create_region(data->compositor);
    1.56 +    region =wl_compositor_create_region(data->compositor);
    1.57      wl_region_add(region, 0, 0, window->w, window->h);
    1.58      wl_surface_set_opaque_region(wind->surface, region);
    1.59      wl_region_destroy(region);
    1.60 @@ -220,7 +220,7 @@
    1.61  
    1.62      if (data) {
    1.63          SDL_EGL_DestroySurface(_this, wind->egl_surface);
    1.64 -        wl_egl_window_destroy(wind->egl_window);
    1.65 +        WAYLAND_wl_egl_window_destroy(wind->egl_window);
    1.66  
    1.67          if (wind->shell_surface)
    1.68              wl_shell_surface_destroy(wind->shell_surface);
    1.69 @@ -232,7 +232,7 @@
    1.70          wl_surface_destroy(wind->surface);
    1.71  
    1.72          SDL_free(wind);
    1.73 -        wayland_schedule_write(data);
    1.74 +        WAYLAND_wl_display_flush(data->display);
    1.75      }
    1.76  }
    1.77