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

window: Fix remaining references to the egl image surface type

Browse Source 
Didn't catch these before, was compiling with sw cairo.
This commit is contained in:
Kristian Høgsberg
2012-04-10 16:55:11 -04:00
parent 38f0c14af3
commit 5990fbb6e2
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+6 -18
View File
@@ -478,17 +478,11 @@ display_create_surface(struct display *display,
if (check_size(rectangle) < 0) if (check_size(rectangle) < 0)
return NULL; return NULL;
#ifdef HAVE_CAIRO_EGL #ifdef HAVE_CAIRO_EGL
if (display->dpy) { if (display->dpy)
if (surface) return display_create_egl_window_surface(display,
return display_create_egl_window_surface(display, surface,
surface, flags,
flags, rectangle);
rectangle);
else
return display_create_egl_image_surface(display,
flags,
rectangle);
}
#endif #endif
return display_create_shm_surface(display, rectangle, flags, NULL); return display_create_shm_surface(display, rectangle, flags, NULL);
} }
@@ -500,13 +494,7 @@ display_create_surface_from_file(struct display *display,
{ {
if (check_size(rectangle) < 0) if (check_size(rectangle) < 0)
return NULL; return NULL;
#ifdef HAVE_CAIRO_EGL
if (display->dpy) {
return display_create_egl_image_surface_from_file(display,
filename,
rectangle);
}
#endif
return display_create_shm_surface_from_file(display, filename, rectangle); return display_create_shm_surface_from_file(display, filename, rectangle);
} }
static const struct { static const struct {