mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-02 21:48:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

[645/906] fix gles2 compilation

Browse source
This commit is contained in:
Matthew Waters 2013-01-10 13:32:16 +11:00 committed by Tim-Philipp Müller
parent 57e209a423
commit 2f2916dd50
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst-libs/gst/gl/gstgldisplay.c
View file

@ -350,7 +350,7 @@ _create_context_gles2 (GstGLDisplay * display, gint * gl_major, gint * gl_minor)
gst_gl_display_set_error (display, "OpenGL|ES >= 2.0 is required"); gst_gl_display_set_error (display, "OpenGL|ES >= 2.0 is required");
_gst_gl_feature_check_ext_functions (display, 0, 0, _gst_gl_feature_check_ext_functions (display, 0, 0,
glGetString (GL_EXTENSIONS)); (const gchar *) glGetString (GL_EXTENSIONS));
display->priv->vtable.gen_fbo = (GstGLWindowCB) _gen_fbo_gles2; display->priv->vtable.gen_fbo = (GstGLWindowCB) _gen_fbo_gles2;
display->priv->vtable.use_fbo = (GstGLWindowCB) _use_fbo_gles2; display->priv->vtable.use_fbo = (GstGLWindowCB) _use_fbo_gles2;
@ -554,9 +554,9 @@ void
gst_gl_display_thread_destroy_context (GstGLDisplay * display) gst_gl_display_thread_destroy_context (GstGLDisplay * display)
{ {
#if GST_GL_HAVE_GLES2 #if GST_GL_HAVE_GLES2
if (display->redisplay_shader) { if (display->priv->redisplay_shader) {
g_object_unref (G_OBJECT (display->redisplay_shader)); g_object_unref (G_OBJECT (display->priv->redisplay_shader));
display->redisplay_shader = NULL; display->priv->redisplay_shader = NULL;
} }
#endif #endif
@ -827,7 +827,8 @@ _use_fbo_gles2 (GstGLDisplay * display)
glGetIntegerv (GL_VIEWPORT, viewport_dim); glGetIntegerv (GL_VIEWPORT, viewport_dim);
glViewport (0, 0, display->use_fbo_width, display->use_fbo_height); glViewport (0, 0, display->priv->use_fbo_width,
display->priv->use_fbo_height);
glClearColor (0.0, 0.0, 0.0, 0.0); glClearColor (0.0, 0.0, 0.0, 0.0);
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@ -952,7 +953,7 @@ _del_fbo_gles2 (GstGLDisplay * display)
glDeleteFramebuffersEXT (1, &display->priv->del_fbo); glDeleteFramebuffersEXT (1, &display->priv->del_fbo);
display->priv->del_fbo = 0; display->priv->del_fbo = 0;
} }
if (display->del_depth_buffer) { if (display->priv->del_depth_buffer) {
glDeleteRenderbuffersEXT (1, &display->priv->del_depth_buffer); glDeleteRenderbuffersEXT (1, &display->priv->del_depth_buffer);
display->priv->del_depth_buffer = 0; display->priv->del_depth_buffer = 0;
} }
@ -1060,7 +1061,7 @@ _del_shader_gles2 (GstGLDisplay * display)
if (display->priv->del_shader) { if (display->priv->del_shader) {
g_object_unref (G_OBJECT (display->priv->del_shader)); g_object_unref (G_OBJECT (display->priv->del_shader));
display->del_shader = NULL; display->priv->del_shader = NULL;
} }
} }
#endif #endif