Revert "gl/eagl: try getting a gles3 context"
authorMatthew Waters <matthew@centricular.com>
Tue, 2 Feb 2016 07:36:34 +0000 (18:36 +1100)
committerTim-Philipp Müller <tim@centricular.com>
Sat, 9 Dec 2017 19:32:16 +0000 (19:32 +0000)
This reverts commit 96b9666d596be115fd4b446ef846508b7fd05c24.
This reverts commit d11385d167d8843604ea23a05e2dea40b8bbac35.

This breaks the texture sharing with the applemedia elements as
CVOpenGLESTextureCache seems to have an arbitrary restriction on GLES2 only.

gst-libs/gst/gl/eagl/gstglcontext_eagl.m

index ecadc3f70c260544db7e1c073eb580e23f21d980..42dde56cf4611b7833dd104a8bf011173369edb2 100644 (file)
@@ -219,29 +219,17 @@ gst_gl_context_eagl_create_context (GstGLContext * context, GstGLAPI gl_api,
 {
   GstGLContextEagl *context_eagl = GST_GL_CONTEXT_EAGL (context);
   GstGLContextEaglPrivate *priv = context_eagl->priv;
-  EAGLSharegroup *share_group;
 
   if (other_context) {
     EAGLContext *external_gl_context = (EAGLContext *)
         gst_gl_context_get_gl_context (other_context);
-    share_group = [external_gl_context sharegroup];
-  } else {
-    share_group = nil;
-  }
+    EAGLSharegroup *share_group = [external_gl_context sharegroup];
 
-  priv->eagl_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3 sharegroup:share_group];
-  if (!priv->eagl_context) {
-    priv->eagl_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup:share_group];
-  }
-  if (!priv->eagl_context) {
-    g_set_error_literal (error, GST_GL_CONTEXT_ERROR,
-        GST_GL_CONTEXT_ERROR_CREATE_CONTEXT,
-        "Failed to create OpenGL ES context");
-    return FALSE;
-  }
-
-  if (share_group)
+    priv->eagl_context = [[EAGLContext alloc] initWithAPI: kEAGLRenderingAPIOpenGLES2 sharegroup:share_group];
     [share_group release];
+  } else {
+    priv->eagl_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
+  }
 
   priv->eagl_layer = NULL;
   priv->framebuffer = 0;