mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

[710/906] window: fail if the user specifies an GL api that we cannot work with

Browse source 
It would've been caught later in an g_assert anyway.
This commit is contained in:
Matthew Waters 2013-06-16 20:34:15 +10:00 committed by Tim-Philipp Müller
parent 2ae5b50fa4
commit 951daee416
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst-libs/gst/gl/gstglwindow.c
View file

@ -578,7 +578,7 @@ _compiled_api (void)
GstGLAPI ret = GST_GL_API_NONE; GstGLAPI ret = GST_GL_API_NONE;
#if GST_GL_HAVE_OPENGL #if GST_GL_HAVE_OPENGL
ret |= GST_GL_API_OPENGL; ret |= GST_GL_API_OPENGL | GST_GL_API_OPENGL3;
#endif #endif
#if GST_GL_HAVE_GLES2 #if GST_GL_HAVE_GLES2
ret |= GST_GL_API_GLES2; ret |= GST_GL_API_GLES2;
@ -655,8 +655,17 @@ _gst_gl_window_thread_create_context (GstGLWindow * window)
compiled_api_s = gst_gl_api_string (compiled_api); compiled_api_s = gst_gl_api_string (compiled_api);
GST_INFO ("Attempting to create opengl context. user chosen api(s):%s, " if ((user_api & compiled_api) == GST_GL_API_NONE) {
"compiled api support:%s", user_api_string, compiled_api_s); g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_WRONG_API,
"Cannot create context with the user requested api (%s). "
"We have support for (%s)", user_api_string, compiled_api_s);
g_free (user_api_string);
g_free (compiled_api_s);
goto failure;
}
GST_INFO ("Attempting to create opengl context. user chosen api(s) (%s), "
"compiled api support (%s)", user_api_string, compiled_api_s);
if (!window_class->create_context (window, compiled_api & user_api, if (!window_class->create_context (window, compiled_api & user_api,
window->priv->external_gl_context, error)) { window->priv->external_gl_context, error)) {
@ -677,7 +686,7 @@ _gst_gl_window_thread_create_context (GstGLWindow * window)
if (((compiled_api & display->gl_api) & user_api) == GST_GL_API_NONE) { if (((compiled_api & display->gl_api) & user_api) == GST_GL_API_NONE) {
g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_WRONG_API, g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_WRONG_API,
"failed to create context, window " "failed to create context, window "
"could not provide correct api. user:%s, compiled:%s, window:%s", "could not provide correct api. user (%s), compiled (%s), window (%s)",
user_api_string, compiled_api_s, api_string); user_api_string, compiled_api_s, api_string);
g_free (api_string); g_free (api_string);
g_free (compiled_api_s); g_free (compiled_api_s);