[vlc-commits] vout/opengl: remove stray OpenGLES 1 support

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Dec 29 16:30:17 2016 +0100| [7ad79cfdc3fcd784724287f7d773d66831c3194e] | committer: Thomas Guillem

vout/opengl: remove stray OpenGLES 1 support

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7ad79cfdc3fcd784724287f7d773d66831c3194e
---

 include/vlc_opengl.h              |  1 -
 modules/video_output/opengl/egl.c | 14 --------------
 src/video_output/opengl.c         |  3 ---
 3 files changed, 18 deletions(-)

diff --git a/include/vlc_opengl.h b/include/vlc_opengl.h
index 53d73d0..6642f78 100644
--- a/include/vlc_opengl.h
+++ b/include/vlc_opengl.h
@@ -54,7 +54,6 @@ struct vlc_gl_t
 
 enum {
     VLC_OPENGL,
-    VLC_OPENGL_ES,
     VLC_OPENGL_ES2,
 };
 
diff --git a/modules/video_output/opengl/egl.c b/modules/video_output/opengl/egl.c
index 3ccdae1..7a2bad0 100644
--- a/modules/video_output/opengl/egl.c
+++ b/modules/video_output/opengl/egl.c
@@ -387,15 +387,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 = {
@@ -419,9 +410,4 @@ vlc_module_begin ()
     set_callbacks (OpenGLES2, Close)
     add_shortcut ("egl")
 
-    add_submodule ()
-    set_capability ("opengl es", 50)
-    set_callbacks (OpenGLES, Close)
-    add_shortcut ("egl")
-
 vlc_module_end ()
diff --git a/src/video_output/opengl.c b/src/video_output/opengl.c
index ac16c3f..cdb0209 100644
--- a/src/video_output/opengl.c
+++ b/src/video_output/opengl.c
@@ -53,9 +53,6 @@ vlc_gl_t *vlc_gl_Create(struct vout_window_t *wnd, unsigned flags,
         case VLC_OPENGL:
             type = "opengl";
             break;
-        case VLC_OPENGL_ES:
-            type = "opengl es";
-            break;
         case VLC_OPENGL_ES2:
             type = "opengl es2";
             break;