[vlc-commits] opengl: use buffer objects instead of host memory for subpictures
Felix Abecassis
git at videolan.org
Tue Apr 1 19:04:34 CEST 2014
vlc | branch: master | Felix Abecassis <felix.abecassis at gmail.com> | Tue Apr 1 15:44:52 2014 +0200| [c2699feec140bdce44cd7423666cd339f57b8541] | committer: Felix Abecassis
opengl: use buffer objects instead of host memory for subpictures
See bbbc51c713432b25b0ffdfa943b8441aa7d4f96e
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c2699feec140bdce44cd7423666cd339f57b8541
---
modules/video_output/opengl.c | 48 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 46 insertions(+), 2 deletions(-)
diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index a5abdc3..35c4779 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -33,6 +33,7 @@
#include <vlc_picture_pool.h>
#include <vlc_subpicture.h>
#include <vlc_opengl.h>
+#include <vlc_memory.h>
#include "opengl.h"
@@ -147,6 +148,9 @@ struct vout_display_opengl_t {
GLuint vertex_buffer_object;
GLuint texture_buffer_object[PICTURE_PLANE_MAX];
+ GLuint *subpicture_buffer_object;
+ int subpicture_buffer_object_count;
+
/* Shader variables commands*/
#ifdef SUPPORTS_SHADERS
PFNGLGETUNIFORMLOCATIONPROC GetUniformLocation;
@@ -683,6 +687,17 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
#ifdef SUPPORTS_SHADERS
vgl->GenBuffers(1, &vgl->vertex_buffer_object);
vgl->GenBuffers(vgl->chroma->plane_count, vgl->texture_buffer_object);
+
+ /* Initial number of allocated buffer objects for subpictures, will grow dynamically. */
+ int subpicture_buffer_object_count = 8;
+ vgl->subpicture_buffer_object = malloc(subpicture_buffer_object_count * sizeof(GLuint));
+ if (!vgl->subpicture_buffer_object) {
+ vlc_gl_Unlock(vgl->gl);
+ vout_display_opengl_Delete(vgl);
+ return NULL;
+ }
+ vgl->subpicture_buffer_object_count = subpicture_buffer_object_count;
+ vgl->GenBuffers(vgl->subpicture_buffer_object_count, vgl->subpicture_buffer_object);
#endif
vlc_gl_Unlock(vgl->gl);
@@ -726,6 +741,9 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
}
vgl->DeleteBuffers(1, &vgl->vertex_buffer_object);
vgl->DeleteBuffers(vgl->chroma->plane_count, vgl->texture_buffer_object);
+ if (vgl->subpicture_buffer_object_count > 0)
+ vgl->DeleteBuffers(vgl->subpicture_buffer_object_count, vgl->subpicture_buffer_object);
+ free(vgl->subpicture_buffer_object);
#endif
free(vgl->texture_temp_buf);
@@ -1239,6 +1257,25 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+#ifdef SUPPORTS_SHADERS
+ /* We need two buffer objects for each region: for vertex and texture coordinates. */
+ if (2 * vgl->region_count > vgl->subpicture_buffer_object_count) {
+ if (vgl->subpicture_buffer_object_count > 0)
+ vgl->DeleteBuffers(vgl->subpicture_buffer_object_count, vgl->subpicture_buffer_object);
+ vgl->subpicture_buffer_object_count = 0;
+
+ int new_count = 2 * vgl->region_count;
+ vgl->subpicture_buffer_object = realloc_or_free(vgl->subpicture_buffer_object, new_count * sizeof(GLuint));
+ if (!vgl->subpicture_buffer_object) {
+ vlc_gl_Unlock(vgl->gl);
+ return VLC_ENOMEM;
+ }
+
+ vgl->subpicture_buffer_object_count = new_count;
+ vgl->GenBuffers(vgl->subpicture_buffer_object_count, vgl->subpicture_buffer_object);
+ }
+#endif
+
glActiveTexture(GL_TEXTURE0 + 0);
glClientActiveTexture(GL_TEXTURE0 + 0);
for (int i = 0; i < vgl->region_count; i++) {
@@ -1260,10 +1297,17 @@ int vout_display_opengl_Display(vout_display_opengl_t *vgl,
if (vgl->program[1]) {
#ifdef SUPPORTS_SHADERS
vgl->Uniform4f(vgl->GetUniformLocation(vgl->program[1], "FillColor"), 1.0f, 1.0f, 1.0f, glr->alpha);
+
+ vgl->BindBuffer(GL_ARRAY_BUFFER, vgl->subpicture_buffer_object[2 * i]);
+ vgl->BufferData(GL_ARRAY_BUFFER, sizeof(textureCoord), textureCoord, GL_STATIC_DRAW);
vgl->EnableVertexAttribArray(vgl->GetAttribLocation(vgl->program[1], "MultiTexCoord0"));
- vgl->VertexAttribPointer(vgl->GetAttribLocation(vgl->program[1], "MultiTexCoord0"), 2, GL_FLOAT, 0, 0, textureCoord);
+ vgl->VertexAttribPointer(vgl->GetAttribLocation(vgl->program[1], "MultiTexCoord0"), 2, GL_FLOAT, 0, 0, 0);
+
+ vgl->BindBuffer(GL_ARRAY_BUFFER, vgl->subpicture_buffer_object[2 * i + 1]);
+ vgl->BufferData(GL_ARRAY_BUFFER, sizeof(vertexCoord), vertexCoord, GL_STATIC_DRAW);
vgl->EnableVertexAttribArray(vgl->GetAttribLocation(vgl->program[1], "VertexPosition"));
- vgl->VertexAttribPointer(vgl->GetAttribLocation(vgl->program[1], "VertexPosition"), 2, GL_FLOAT, 0, 0, vertexCoord);
+ vgl->VertexAttribPointer(vgl->GetAttribLocation(vgl->program[1], "VertexPosition"), 2, GL_FLOAT, 0, 0, 0);
+
// Subpictures have the correct orientation:
vgl->UniformMatrix4fv(vgl->GetUniformLocation(vgl->program[1], "RotationMatrix"), 1, GL_FALSE, identity);
#endif
More information about the vlc-commits
mailing list