diff options
author | Julien Isorce <julien.isorce@gmail.com> | 2009-09-19 14:31:28 +0200 |
---|---|---|
committer | Matthew Waters <ystreet00@gmail.com> | 2014-03-15 18:36:36 +0100 |
commit | 30631c462646b353b6a15abe83e3866bcebe4911 (patch) | |
tree | d7aa01e8df8e4f7011f0e6bd4ff6903fab966fb5 /gst-libs | |
parent | 192bf749ea7ec7713dcde8cf3224fc80e85df4ab (diff) | |
download | gstreamer-plugins-bad-30631c462646b353b6a15abe83e3866bcebe4911.tar.gz |
[378/906] gldisplay: avoid to request gl thread when deleting a texture
A texture is not destroyed when when we are done with it.
This texture is just added to the texture pool in order to be
re-used. In this case no OpenGL code is executed so we do not need to
request gl thread.
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/gst/gl/gstgldisplay.c | 18 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstgldisplay.h | 3 |
2 files changed, 1 insertions, 20 deletions
diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index 1c152418d..5834825d9 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -59,7 +59,6 @@ gpointer gst_gl_display_thread_create_context (GstGLDisplay * display); void gst_gl_display_thread_destroy_context (GstGLDisplay * display); void gst_gl_display_thread_run_generic (GstGLDisplay * display); void gst_gl_display_thread_gen_texture (GstGLDisplay * display); -void gst_gl_display_thread_del_texture (GstGLDisplay * display); #ifdef OPENGL_ES2 void gst_gl_display_thread_init_redisplay (GstGLDisplay * display); #endif @@ -145,9 +144,6 @@ gst_gl_display_init (GstGLDisplay * display, GstGLDisplayClass * klass) display->gen_texture = 0; display->gen_texture_width = 0; display->gen_texture_height = 0; - display->del_texture = 0; - display->del_texture_width = 0; - display->del_texture_height = 0; //client callbacks display->clientReshapeCallback = NULL; @@ -764,14 +760,6 @@ gst_gl_display_thread_gen_texture (GstGLDisplay * display) } -/* Called in the gl thread */ -void -gst_gl_display_thread_del_texture (GstGLDisplay * display) -{ - gst_gl_display_gldel_texture (display, &display->del_texture, - display->del_texture_width, display->del_texture_height); -} - #ifdef OPENGL_ES2 /* Called in the gl thread */ void @@ -2187,11 +2175,7 @@ gst_gl_display_del_texture (GstGLDisplay * display, GLuint texture, GLint width, { gst_gl_display_lock (display); if (texture) { - display->del_texture = texture; - display->del_texture_width = width; - display->del_texture_height = height; - gst_gl_window_send_message (display->gl_window, - GST_GL_WINDOW_CB (gst_gl_display_thread_del_texture), display); + gst_gl_display_gldel_texture (display, &texture, width, height); } gst_gl_display_unlock (display); } diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h index 738c6f3e7..146ddfb0f 100644 --- a/gst-libs/gst/gl/gstgldisplay.h +++ b/gst-libs/gst/gl/gstgldisplay.h @@ -113,9 +113,6 @@ struct _GstGLDisplay GLuint gen_texture; GLuint gen_texture_width; GLuint gen_texture_height; - GLuint del_texture; - GLuint del_texture_width; - GLuint del_texture_height; //client callbacks CRCB clientReshapeCallback; |