summaryrefslogtreecommitdiff
path: root/gst-libs/gst
diff options
context:
space:
mode:
authorMatthew Waters <matthew@centricular.com>2016-02-02 18:36:34 +1100
committerMatthew Waters <matthew@centricular.com>2016-02-02 18:37:44 +1100
commiteb142736318463e6e553c21707ba0d716f85a46f (patch)
tree7c4ca1ac0159e0731d2bffc6165c7b97b32a7752 /gst-libs/gst
parent87573ba66c77bb7cc060460eb29e31412f1492b4 (diff)
downloadgstreamer-plugins-bad-eb142736318463e6e553c21707ba0d716f85a46f.tar.gz
Revert "gl/eagl: try getting a gles3 context"
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.
Diffstat (limited to 'gst-libs/gst')
-rw-r--r--gst-libs/gst/gl/eagl/gstglcontext_eagl.m22
1 files changed, 5 insertions, 17 deletions
diff --git a/gst-libs/gst/gl/eagl/gstglcontext_eagl.m b/gst-libs/gst/gl/eagl/gstglcontext_eagl.m
index ecadc3f70..42dde56cf 100644
--- a/gst-libs/gst/gl/eagl/gstglcontext_eagl.m
+++ b/gst-libs/gst/gl/eagl/gstglcontext_eagl.m
@@ -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;