mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: simplify window_create_surface

Browse Source 
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen
2012-11-19 17:16:00 +02:00
committed by Kristian Høgsberg
parent 9943686be3
commit b362736bb2
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+23 -18
View File
@@ -494,6 +494,9 @@ egl_window_surface_create(struct display *display,
{ {
struct egl_window_surface *surface; struct egl_window_surface *surface;
if (display->dpy == EGL_NO_DISPLAY)
return NULL;
surface = calloc(1, sizeof *surface); surface = calloc(1, sizeof *surface);
if (!surface) if (!surface)
return NULL; return NULL;
@@ -525,6 +528,17 @@ egl_window_surface_create(struct display *display,
return &surface->base; return &surface->base;
} }
#else
static struct toysurface *
egl_window_surface_create(struct display *display,
struct wl_surface *wl_surface,
uint32_t flags,
struct rectangle *rectangle)
{
return NULL;
}
#endif #endif
struct shm_surface_data { struct shm_surface_data {
@@ -1130,28 +1144,19 @@ window_create_surface(struct window *window)
if (!window->transparent) if (!window->transparent)
flags = SURFACE_OPAQUE; flags = SURFACE_OPAQUE;
switch (window->buffer_type) { if (!window->toysurface &&
#ifdef HAVE_CAIRO_EGL window->buffer_type == WINDOW_BUFFER_TYPE_EGL_WINDOW &&
case WINDOW_BUFFER_TYPE_EGL_WINDOW: window->display->dpy) {
if (!window->toysurface && window->display->dpy) window->toysurface =
window->toysurface = egl_window_surface_create(window->display,
egl_window_surface_create(window->display, window->surface, flags,
window->surface, &window->allocation);
flags, }
&window->allocation);
if (window->toysurface) if (!window->toysurface)
break;
/* fall through */
#endif
case WINDOW_BUFFER_TYPE_SHM:
window->toysurface = shm_surface_create(window->display, window->toysurface = shm_surface_create(window->display,
window->surface, flags, window->surface, flags,
&window->allocation); &window->allocation);
break;
default:
assert(0);
}
window_get_resize_dx_dy(window, &dx, &dy); window_get_resize_dx_dy(window, &dx, &dy);
window->cairo_surface = window->cairo_surface =