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

[821/906] tests: fix test_share on GLESv2

Browse source
This commit is contained in:
Julien Isorce 2013-10-01 11:42:21 +00:00 committed by Tim-Philipp Müller
parent e1eb30005c
commit 6e732b0408
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/gstglframebuffer.c
View file

@ -300,7 +300,9 @@ gst_gl_framebuffer_use_v2 (GstGLFramebuffer * frame, gint texture_fbo_width,
gl->Viewport (0, 0, texture_fbo_width, texture_fbo_height); gl->Viewport (0, 0, texture_fbo_width, texture_fbo_height);
#if GST_GL_HAVE_OPENGL
gl->DrawBuffer (GL_COLOR_ATTACHMENT0); gl->DrawBuffer (GL_COLOR_ATTACHMENT0);
#endif
gl->ClearColor (0.0, 0.0, 0.0, 0.0); gl->ClearColor (0.0, 0.0, 0.0, 0.0);
gl->Clear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); gl->Clear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@ -308,7 +310,9 @@ gst_gl_framebuffer_use_v2 (GstGLFramebuffer * frame, gint texture_fbo_width,
/* the opengl scene */ /* the opengl scene */
cb (stuff); cb (stuff);
#if GST_GL_HAVE_OPENGL
gl->DrawBuffer (GL_NONE); gl->DrawBuffer (GL_NONE);
#endif
gl->Viewport (viewport_dim[0], viewport_dim[1], gl->Viewport (viewport_dim[0], viewport_dim[1],
viewport_dim[2], viewport_dim[3]); viewport_dim[2], viewport_dim[3]);

2
tests/check/libs/gstglcontext.c
View file

@ -89,7 +89,7 @@ init (gpointer data)
fail_if (tex == 0, "failed to create texture"); fail_if (tex == 0, "failed to create texture");
#if GST_GL_HAVE_GLES2 #if GST_GL_HAVE_GLES2
shader = gst_gl_shader_new (display); shader = gst_gl_shader_new (context);
fail_if (shader == NULL, "failed to create shader object"); fail_if (shader == NULL, "failed to create shader object");
gst_gl_shader_set_vertex_source (shader, vertex_shader_str_gles2); gst_gl_shader_set_vertex_source (shader, vertex_shader_str_gles2);