mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: fixup vao and vbo usage for legacy GL

Browse source
This commit is contained in:
Matthew Waters 2014-12-11 18:15:02 +11:00 committed by Tim-Philipp Müller
parent b428dec737
commit ba3a3cd783
6 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/gl/gstglfiltercube.c
View file

@ -468,6 +468,7 @@ _callback (gpointer stuff)
if (gl->GenVertexArrays) {
_bind_buffer (cube_filter);
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
}
}

10
ext/gl/gstglimagesink.c
View file

@ -1215,8 +1215,12 @@ gst_glimage_sink_thread_init_redisplay (GstGLImageSink * gl_sink)
gl->GenBuffers (1, &gl_sink->vertex_buffer);
_bind_buffer (gl_sink);
if (gl->GenVertexArrays)
if (gl->GenVertexArrays) {
gl->BindVertexArray (0);
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
} else {
_unbind_buffer (gl_sink);
}
}
static void
@ -1229,8 +1233,10 @@ gst_glimage_sink_cleanup_glthread (GstGLImageSink * gl_sink)
gl_sink->redisplay_shader = NULL;
}
if (gl_sink->vao)
if (gl_sink->vao) {
gl->DeleteVertexArrays (1, &gl_sink->vao);
gl_sink->vao = 0;
}
}
static void

1
ext/gl/gstgloverlay.c
View file

@ -532,6 +532,7 @@ gst_gl_overlay_callback (gint width, gint height, guint texture, gpointer stuff)
if (overlay->geometry_change)
_bind_buffer (overlay, overlay->overlay_vbo);
gl->BindVertexArray (overlay->overlay_vao);
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
} else {
_bind_buffer (overlay, overlay->overlay_vbo);
}

12
ext/gl/gstgltransformation.c
View file

@ -465,8 +465,6 @@ _upload_vertices (GstGLTransformation * transformation)
gl->BufferData (GL_ARRAY_BUFFER, 4 * 6 * sizeof (GLfloat), vertices,
GL_STATIC_DRAW);
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
}
static void
@ -546,12 +544,16 @@ gst_gl_transformation_callback (gpointer stuff)
if (gl->GenVertexArrays)
gl->BindVertexArray (transformation->vao);
if (transformation->caps_change)
if (transformation->caps_change) {
_upload_vertices (transformation);
if (!gl->GenVertexArrays || transformation->caps_change)
_bind_buffer (transformation);
if (gl->GenVertexArrays)
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
} else if (!gl->GenVertexArrays) {
_bind_buffer (transformation);
}
gl->DrawElements (GL_TRIANGLE_STRIP, 5, GL_UNSIGNED_SHORT, indices);
if (gl->GenVertexArrays)

3
ext/gl/gstglvideomixer.c
View file

@ -747,9 +747,8 @@ gst_gl_video_mixer_callback (gpointer stuff)
if (gl->GenVertexArrays)
gl->BindVertexArray (0);
else
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
gl->BindTexture (GL_TEXTURE_2D, 0);
gl->Disable (GL_BLEND);

1
gst-libs/gst/gl/gstglfilter.c
View file

@ -1596,6 +1596,7 @@ gst_gl_filter_draw_texture (GstGLFilter * filter, GLuint texture,
if (gl->GenVertexArrays) {
_bind_buffer (filter);
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
}
}