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

glcolorconvert: cache indices in a buffer object

Browse source
This commit is contained in:
Julien Isorce 2015-03-12 16:46:44 +00:00 committed by Tim-Philipp Müller
parent 95756a5413
commit d6e460095f
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst-libs/gst/gl/gstglcolorconvert.c
View file

@ -415,6 +415,9 @@ static const GLfloat vertices[] = {
-1.0f, 1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, 0.0f, 0.0f, 1.0f,
1.0f, 1.0f, 0.0f, 1.0f, 1.0f 1.0f, 1.0f, 0.0f, 1.0f, 1.0f
}; };
static const GLushort indices[] = { 0, 1, 2, 0, 2, 3 };
/* *INDENT-ON* */ /* *INDENT-ON* */
struct ConvertInfo struct ConvertInfo
@ -441,6 +444,7 @@ struct _GstGLColorConvertPrivate
GLuint vao; GLuint vao;
GLuint vertex_buffer; GLuint vertex_buffer;
GLuint vbo_indices;
GLuint attr_position; GLuint attr_position;
GLuint attr_texture; GLuint attr_texture;
}; };
@ -531,6 +535,11 @@ _reset_gl (GstGLContext * context, GstGLColorConvert * convert)
gl->DeleteBuffers (1, &convert->priv->vertex_buffer); gl->DeleteBuffers (1, &convert->priv->vertex_buffer);
convert->priv->vertex_buffer = 0; convert->priv->vertex_buffer = 0;
} }
if (convert->priv->vbo_indices) {
gl->DeleteBuffers (1, &convert->priv->vbo_indices);
convert->priv->vbo_indices = 0;
}
} }
static void static void
@ -1335,6 +1344,15 @@ _init_convert (GstGLColorConvert * convert)
gl->BindBuffer (GL_ARRAY_BUFFER, 0); gl->BindBuffer (GL_ARRAY_BUFFER, 0);
} }
if (!convert->priv->vbo_indices) {
gl->GenBuffers (1, &convert->priv->vbo_indices);
gl->BindBuffer (GL_ELEMENT_ARRAY_BUFFER, convert->priv->vbo_indices);
gl->BufferData (GL_ELEMENT_ARRAY_BUFFER, sizeof (indices), indices,
GL_STATIC_DRAW);
gl->BindBuffer (GL_ARRAY_BUFFER, 0);
}
gl->BindTexture (GL_TEXTURE_2D, 0); gl->BindTexture (GL_TEXTURE_2D, 0);
convert->initted = TRUE; convert->initted = TRUE;
@ -1621,8 +1639,6 @@ _do_convert_draw (GstGLContext * context, GstGLColorConvert * convert)
GLint viewport_dim[4]; GLint viewport_dim[4];
GLushort indices[] = { 0, 1, 2, 0, 2, 3 };
GLenum multipleRT[] = { GLenum multipleRT[] = {
GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT0,
GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT1,
@ -1679,7 +1695,8 @@ _do_convert_draw (GstGLContext * context, GstGLColorConvert * convert)
g_free (scale_name); g_free (scale_name);
} }
gl->DrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, indices); gl->BindBuffer (GL_ELEMENT_ARRAY_BUFFER, convert->priv->vbo_indices);
gl->DrawElements (GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, 0);
if (gl->BindVertexArray) if (gl->BindVertexArray)
gl->BindVertexArray (0); gl->BindVertexArray (0);
@ -1689,6 +1706,8 @@ _do_convert_draw (GstGLContext * context, GstGLColorConvert * convert)
if (gl->DrawBuffer) if (gl->DrawBuffer)
gl->DrawBuffer (GL_NONE); gl->DrawBuffer (GL_NONE);
gl->BindBuffer (GL_ELEMENT_ARRAY_BUFFER, 0);
/* we are done with the shader */ /* we are done with the shader */
gst_gl_context_clear_shader (context); gst_gl_context_clear_shader (context);