[vlc-devel] [PATCH 2/2] opengl: remove OpenGL ES 1

[Ilkka Ollakka]

---
 include/vlc_opengl.h          |    1 -
 modules/video_output/egl.c    |   14 --------------
 modules/video_output/gl.c     |   10 ----------
 modules/video_output/ios.m    |    6 +++---
 modules/video_output/opengl.h |    4 ----
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/include/vlc_opengl.h b/include/vlc_opengl.h
index ab5a5ac..f4ad922 100644
--- a/include/vlc_opengl.h
+++ b/include/vlc_opengl.h
@@ -53,7 +53,6 @@ struct vlc_gl_t
 
 enum {
     VLC_OPENGL,
-    VLC_OPENGL_ES,
     VLC_OPENGL_ES2,
 };
 
diff --git a/modules/video_output/egl.c b/modules/video_output/egl.c
index 8217478..d550f52 100644
--- a/modules/video_output/egl.c
+++ b/modules/video_output/egl.c
@@ -38,7 +38,6 @@
 
 /* Plugin callbacks */
 static int OpenGLES2 (vlc_object_t *);
-static int OpenGLES (vlc_object_t *);
 static int OpenGL (vlc_object_t *);
 static void Close (vlc_object_t *);
 
@@ -54,10 +53,6 @@ vlc_module_begin ()
     set_capability ("opengl es2", 50)
     set_callbacks (OpenGLES2, Close)
 
-    add_submodule ()
-    set_capability ("opengl es", 50)
-    set_callbacks (OpenGLES, Close)
-
 vlc_module_end ()
 
 typedef struct vlc_gl_sys_t
@@ -215,15 +210,6 @@ static int OpenGLES2 (vlc_object_t *obj)
     return Open (obj, &api);
 }
 
-static int OpenGLES (vlc_object_t *obj)
-{
-    static const struct gl_api api = {
-        "OpenGL_ES", EGL_OPENGL_ES_API, 0, EGL_OPENGL_ES_BIT,
-        { EGL_CONTEXT_CLIENT_VERSION, 1, EGL_NONE },
-    };
-    return Open (obj, &api);
-}
-
 static int OpenGL (vlc_object_t *obj)
 {
     static const struct gl_api api = {
diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index a7acdd3..63d72e4 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -56,16 +56,6 @@ vlc_module_begin ()
     add_module ("gles2", "opengl es2", NULL,
                 GLES2_TEXT, PROVIDER_LONGTEXT, true)
 
-#elif USE_OPENGL_ES == 1
-# define API VLC_OPENGL_ES
-# define MODULE_VARNAME "gles"
-    set_shortname (N_("OpenGL ES"))
-    set_description (N_("OpenGL for Embedded Systems video output"))
-    set_capability ("vout display", /*160*/0)
-    set_callbacks (Open, Close)
-    add_shortcut ("opengles", "gles")
-    add_module ("gles", "opengl es", NULL,
-                GLES_TEXT, PROVIDER_LONGTEXT, true)
 #else
 # define API VLC_OPENGL
 # define MODULE_VARNAME "gl"
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index b35748b..e56f28d 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -26,8 +26,8 @@
  *****************************************************************************/
 
 #import <UIKit/UIKit.h>
-#import <OpenGLES/ES1/gl.h>
-#import <OpenGLES/ES1/glext.h>
+#import <OpenGLES/ES2/gl2.h>
+#import <OpenGLES/ES2/gl2ext.h>
 #include <QuartzCore/QuartzCore.h>
 
 #ifdef HAVE_CONFIG_H
@@ -39,7 +39,7 @@
 #include <vlc_vout_display.h>
 #include <vlc_opengl.h>
 
-#define USE_OPENGL_ES 1
+#define USE_OPENGL_ES 2
 
 #include "opengl.h"
 
diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h
index 488e7dc..c10b904 100644
--- a/modules/video_output/opengl.h
+++ b/modules/video_output/opengl.h
@@ -37,8 +37,6 @@
 #if !defined (__APPLE__)
 # if USE_OPENGL_ES == 2
 #  include <GLES2/gl2.h>
-# elif USE_OPENGL_ES == 1
-#  include <GLES/gl.h>
 # else
 #  ifdef WIN32
 #   include <GL/glew.h>
@@ -50,8 +48,6 @@
 #else
 # if USE_OPENGL_ES == 2
 #  include <OpenGLES/ES2/gl.h>
-# elif USE_OPENGL_ES == 1
-#  include <OpenGLES/ES1/gl.h>
 # else
 #  define MACOS_OPENGL
 #  include <OpenGL/gl.h>
-- 
1.7.9.2