From 9c97695b5a8d99de5cbbc6081bbd14c07166b639 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Thu, 1 Mar 2012 17:25:54 +0000 Subject: [PATCH] Ecore_Wayland: Remove image_target_texture_2d (not used and requires GL header which causes issues for E17 wayland only). SVN revision: 68582 --- legacy/ecore/src/lib/ecore_wayland/Ecore_Wayland.h | 4 ++-- legacy/ecore/src/lib/ecore_wayland/ecore_wl.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_wayland/Ecore_Wayland.h b/legacy/ecore/src/lib/ecore_wayland/Ecore_Wayland.h index dcfa477f63..d032d335c9 100644 --- a/legacy/ecore/src/lib/ecore_wayland/Ecore_Wayland.h +++ b/legacy/ecore/src/lib/ecore_wayland/Ecore_Wayland.h @@ -1,10 +1,11 @@ #ifndef _ECORE_WAYLAND_H_ # define _ECORE_WAYLAND_H_ +# define GL_GLEXT_PROTOTYPES + # include # include # include // NB: already includes wayland-client.h -# include # include # include @@ -92,7 +93,6 @@ struct _Ecore_Wl_Display Ecore_Wl_Output *output; - PFNGLEGLIMAGETARGETTEXTURE2DOESPROC image_target_texture_2d; PFNEGLCREATEIMAGEKHRPROC create_image; PFNEGLDESTROYIMAGEKHRPROC destroy_image; diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c index a3ad251689..4af5d89d6b 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl.c @@ -171,8 +171,6 @@ ecore_wl_init(const char *name) return --_ecore_wl_init_count; } - _ecore_wl_disp->image_target_texture_2d = - (void *)eglGetProcAddress("glEGLImageTargetTexture2DOES"); _ecore_wl_disp->create_image = (void *)eglGetProcAddress("eglCreateImageKHR"); _ecore_wl_disp->destroy_image =