mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

[713/906] shader: make it possible to create the object in a non-GL thread

Browse source
This commit is contained in:
Matthew Waters 2013-06-16 20:41:29 +10:00
parent 4801abb13a
commit 09496fc8a1
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst-libs/gst/gl/gstglshader.c
View file

@ -350,13 +350,6 @@ gst_gl_shader_new (GstGLDisplay * display)
shader = g_object_new (GST_GL_TYPE_SHADER, NULL); shader = g_object_new (GST_GL_TYPE_SHADER, NULL);
shader->display = gst_object_ref (display); shader->display = gst_object_ref (display);
if (!_fill_vtable (shader, display))
return NULL;
shader->priv->program_handle = shader->priv->vtable.CreateProgram ();
GST_TRACE ("shader initialized %u", shader->priv->program_handle);
return shader; return shader;
} }
@ -386,6 +379,13 @@ gst_gl_shader_compile (GstGLShader * shader, GError ** error)
if (priv->compiled) if (priv->compiled)
return priv->compiled; return priv->compiled;
if (!_fill_vtable (shader, shader->display))
return FALSE;
shader->priv->program_handle = shader->priv->vtable.CreateProgram ();
GST_TRACE ("shader created %u", shader->priv->program_handle);
g_return_val_if_fail (priv->program_handle, FALSE); g_return_val_if_fail (priv->program_handle, FALSE);
if (priv->vertex_src) { if (priv->vertex_src) {
@ -480,9 +480,7 @@ gst_gl_shader_release (GstGLShader * shader)
priv = shader->priv; priv = shader->priv;
g_return_if_fail (priv->program_handle); if (!priv->compiled || !priv->program_handle)
if (!priv->compiled)
return; return;
if (priv->vertex_handle) { /* not needed but nvidia doesn't care to respect the spec */ if (priv->vertex_handle) { /* not needed but nvidia doesn't care to respect the spec */