[PATCH weston 1/7] window: remove dead EGL code

Pekka Paalanen ppaalanen at gmail.com
Tue Oct 16 07:27:16 PDT 2012


- remove unimplemented function from header
- remove the egl function pointers that were not used

Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
---
 clients/window.c |    9 ---------
 clients/window.h |    6 ------
 2 files changed, 0 insertions(+), 15 deletions(-)

diff --git a/clients/window.c b/clients/window.c
index 9bc9e19..30fc67c 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -111,10 +111,6 @@ struct display {
 	struct wl_cursor_theme *cursor_theme;
 	struct wl_cursor **cursors;
 
-	PFNGLEGLIMAGETARGETTEXTURE2DOESPROC image_target_texture_2d;
-	PFNEGLCREATEIMAGEKHRPROC create_image;
-	PFNEGLDESTROYIMAGEKHRPROC destroy_image;
-
 	display_output_handler_t output_configure_handler;
 	display_global_handler_t global_handler;
 
@@ -3902,11 +3898,6 @@ display_create(int argc, char *argv[])
 		return NULL;
 #endif
 
-	d->image_target_texture_2d =
-		(void *) eglGetProcAddress("glEGLImageTargetTexture2DOES");
-	d->create_image = (void *) eglGetProcAddress("eglCreateImageKHR");
-	d->destroy_image = (void *) eglGetProcAddress("eglDestroyImageKHR");
-
 	create_cursors(d);
 
 	d->theme = theme_create();
diff --git a/clients/window.h b/clients/window.h
index 17d97d6..c86d7e7 100644
--- a/clients/window.h
+++ b/clients/window.h
@@ -115,12 +115,6 @@ display_acquire_window_surface(struct display *display,
 void
 display_release_window_surface(struct display *display,
 			       struct window *window);
-
-#ifdef HAVE_CAIRO_EGL
-EGLImageKHR
-display_get_image_for_egl_image_surface(struct display *display,
-					cairo_surface_t *surface);
-#endif
 #endif
 
 #define SURFACE_OPAQUE 0x01
-- 
1.7.8.6



More information about the wayland-devel mailing list