mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

egl: Wrap KHR_create_context flags in an ifdef

Browse source 
EGL_CONTEXT_FLAGS_KHR and EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR
don't exist in the Android NDK. Wrap their usage in an #ifdef
EGL_KHR_create_context to fix the build there.
This commit is contained in:
Jan Schmidt 2014-08-26 12:38:52 +10:00 committed by Tim-Philipp Müller
parent f6930bc0b4
commit 2d928bad1c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/egl/gstglcontext_egl.c
View file

@ -336,7 +336,7 @@ gst_gl_context_egl_create_context (GstGLContext * context,
context_attrib[i++] = EGL_CONTEXT_CLIENT_VERSION; context_attrib[i++] = EGL_CONTEXT_CLIENT_VERSION;
context_attrib[i++] = 2; context_attrib[i++] = 2;
} }
#if !defined(GST_DISABLE_GST_DEBUG) #if !defined(GST_DISABLE_GST_DEBUG) && defined(EGL_KHR_create_context)
if (gst_gl_check_extension ("EGL_KHR_create_context", egl_exts)) { if (gst_gl_check_extension ("EGL_KHR_create_context", egl_exts)) {
context_attrib[i++] = EGL_CONTEXT_FLAGS_KHR; context_attrib[i++] = EGL_CONTEXT_FLAGS_KHR;
context_attrib[i++] = EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR; context_attrib[i++] = EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
@ -348,6 +348,7 @@ gst_gl_context_egl_create_context (GstGLContext * context,
eglCreateContext (egl->egl_display, egl->egl_config, eglCreateContext (egl->egl_display, egl->egl_config,
(EGLContext) external_gl_context, context_attrib); (EGLContext) external_gl_context, context_attrib);
#ifdef EGL_KHR_create_context
if (egl->egl_context == EGL_NO_CONTEXT && egl->gl_api & GST_GL_API_GLES2 if (egl->egl_context == EGL_NO_CONTEXT && egl->gl_api & GST_GL_API_GLES2
&& eglGetError () != EGL_SUCCESS) { && eglGetError () != EGL_SUCCESS) {
/* try without EGL_CONTEXT_FLAGS flags as it was added to /* try without EGL_CONTEXT_FLAGS flags as it was added to
@ -362,6 +363,7 @@ gst_gl_context_egl_create_context (GstGLContext * context,
eglCreateContext (egl->egl_display, egl->egl_config, eglCreateContext (egl->egl_display, egl->egl_config,
(EGLContext) external_gl_context, context_attrib); (EGLContext) external_gl_context, context_attrib);
} }
#endif
if (egl->egl_context != EGL_NO_CONTEXT) { if (egl->egl_context != EGL_NO_CONTEXT) {
GST_INFO ("gl context created: %" G_GUINTPTR_FORMAT, GST_INFO ("gl context created: %" G_GUINTPTR_FORMAT,