mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

eglglessink: More consistent naming of shader related variables

Browse source
This commit is contained in:
Sebastian Dröge 2012-09-27 14:02:17 +02:00
parent 1ad253b9b7
commit 2b2ae0fd6f
2 changed files with 68 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
ext/eglgles/gsteglglessink.c
View file

@ -1050,9 +1050,9 @@ gst_eglglessink_stop (GstBaseSink * sink)
/* EGL/GLES2 cleanup */ /* EGL/GLES2 cleanup */
if (eglglessink->rendering_path == GST_EGLGLESSINK_RENDER_SLOW) { if (eglglessink->rendering_path == GST_EGLGLESSINK_RENDER_SLOW) {
glDeleteBuffers (1, &eglglessink->eglglesctx->vdata); glDeleteBuffers (1, &eglglessink->eglglesctx->position_buffer);
glDeleteBuffers (1, &eglglessink->eglglesctx->tdata); glDeleteBuffers (1, &eglglessink->eglglesctx->texpos_buffer);
glDeleteBuffers (1, &eglglessink->eglglesctx->idata); glDeleteBuffers (1, &eglglessink->eglglesctx->index_buffer);
eglglessink->have_vbo = FALSE; eglglessink->have_vbo = FALSE;
glDeleteShader (eglglessink->eglglesctx->fragshader); glDeleteShader (eglglessink->eglglesctx->fragshader);
@ -1274,97 +1274,100 @@ gst_eglglessink_setup_vbo (GstEglGlesSink * eglglessink, gboolean reset)
eglglessink->have_vbo, reset); eglglessink->have_vbo, reset);
if (eglglessink->have_vbo && reset) { if (eglglessink->have_vbo && reset) {
glDeleteBuffers (1, &eglglessink->eglglesctx->vdata); glDeleteBuffers (1, &eglglessink->eglglesctx->position_buffer);
glDeleteBuffers (1, &eglglessink->eglglesctx->tdata); glDeleteBuffers (1, &eglglessink->eglglesctx->texpos_buffer);
glDeleteBuffers (1, &eglglessink->eglglesctx->idata); glDeleteBuffers (1, &eglglessink->eglglesctx->index_buffer);
eglglessink->have_vbo = FALSE; eglglessink->have_vbo = FALSE;
} }
if (!eglglessink->have_vbo) { if (!eglglessink->have_vbo) {
GST_DEBUG_OBJECT (eglglessink, "Performing VBO setup"); GST_DEBUG_OBJECT (eglglessink, "Performing VBO setup");
eglglessink->eglglesctx->coordarray[0].x = 1; eglglessink->eglglesctx->position_array[0].x = 1;
eglglessink->eglglesctx->coordarray[0].y = 1; eglglessink->eglglesctx->position_array[0].y = 1;
eglglessink->eglglesctx->coordarray[0].z = 0; eglglessink->eglglesctx->position_array[0].z = 0;
eglglessink->eglglesctx->coordarray[1].x = 1; eglglessink->eglglesctx->position_array[1].x = 1;
eglglessink->eglglesctx->coordarray[1].y = -1; eglglessink->eglglesctx->position_array[1].y = -1;
eglglessink->eglglesctx->coordarray[1].z = 0; eglglessink->eglglesctx->position_array[1].z = 0;
eglglessink->eglglesctx->coordarray[2].x = -1; eglglessink->eglglesctx->position_array[2].x = -1;
eglglessink->eglglesctx->coordarray[2].y = 1; eglglessink->eglglesctx->position_array[2].y = 1;
eglglessink->eglglesctx->coordarray[2].z = 0; eglglessink->eglglesctx->position_array[2].z = 0;
eglglessink->eglglesctx->coordarray[3].x = -1; eglglessink->eglglesctx->position_array[3].x = -1;
eglglessink->eglglesctx->coordarray[3].y = -1; eglglessink->eglglesctx->position_array[3].y = -1;
eglglessink->eglglesctx->coordarray[3].z = 0; eglglessink->eglglesctx->position_array[3].z = 0;
eglglessink->eglglesctx->texarray[0].x = 1; eglglessink->eglglesctx->texpos_array[0].x = 1;
eglglessink->eglglesctx->texarray[0].y = 0; eglglessink->eglglesctx->texpos_array[0].y = 0;
eglglessink->eglglesctx->texarray[1].x = 1; eglglessink->eglglesctx->texpos_array[1].x = 1;
eglglessink->eglglesctx->texarray[1].y = 1; eglglessink->eglglesctx->texpos_array[1].y = 1;
eglglessink->eglglesctx->texarray[2].x = 0; eglglessink->eglglesctx->texpos_array[2].x = 0;
eglglessink->eglglesctx->texarray[2].y = 0; eglglessink->eglglesctx->texpos_array[2].y = 0;
eglglessink->eglglesctx->texarray[3].x = 0; eglglessink->eglglesctx->texpos_array[3].x = 0;
eglglessink->eglglesctx->texarray[3].y = 1; eglglessink->eglglesctx->texpos_array[3].y = 1;
eglglessink->eglglesctx->indexarray[0] = 0; eglglessink->eglglesctx->index_array[0] = 0;
eglglessink->eglglesctx->indexarray[1] = 1; eglglessink->eglglesctx->index_array[1] = 1;
eglglessink->eglglesctx->indexarray[2] = 2; eglglessink->eglglesctx->index_array[2] = 2;
eglglessink->eglglesctx->indexarray[3] = 3; eglglessink->eglglesctx->index_array[3] = 3;
glGenBuffers (1, &eglglessink->eglglesctx->vdata); glGenBuffers (1, &eglglessink->eglglesctx->position_buffer);
glGenBuffers (1, &eglglessink->eglglesctx->tdata); glGenBuffers (1, &eglglessink->eglglesctx->texpos_buffer);
glGenBuffers (1, &eglglessink->eglglesctx->idata); glGenBuffers (1, &eglglessink->eglglesctx->index_buffer);
if (got_gl_error ("glGenBuffers")) if (got_gl_error ("glGenBuffers"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glBindBuffer (GL_ARRAY_BUFFER, eglglessink->eglglesctx->vdata); glBindBuffer (GL_ARRAY_BUFFER, eglglessink->eglglesctx->position_buffer);
if (got_gl_error ("glBindBuffer vdata")) if (got_gl_error ("glBindBuffer position_buffer"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glBufferData (GL_ARRAY_BUFFER, sizeof (eglglessink->eglglesctx->coordarray), glBufferData (GL_ARRAY_BUFFER,
eglglessink->eglglesctx->coordarray, GL_STATIC_DRAW); sizeof (eglglessink->eglglesctx->position_array),
if (got_gl_error ("glBufferData vdata")) eglglessink->eglglesctx->position_array, GL_STATIC_DRAW);
if (got_gl_error ("glBufferData position_buffer"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glVertexAttribPointer (eglglessink->eglglesctx->coord_pos, 3, GL_FLOAT, glVertexAttribPointer (eglglessink->eglglesctx->position_loc, 3, GL_FLOAT,
GL_FALSE, 0, 0); GL_FALSE, 0, 0);
if (got_gl_error ("glVertexAttribPointer")) if (got_gl_error ("glVertexAttribPointer"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glEnableVertexAttribArray (eglglessink->eglglesctx->coord_pos); glEnableVertexAttribArray (eglglessink->eglglesctx->position_loc);
if (got_gl_error ("glEnableVertexAttribArray")) if (got_gl_error ("glEnableVertexAttribArray"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glBindBuffer (GL_ARRAY_BUFFER, eglglessink->eglglesctx->tdata); glBindBuffer (GL_ARRAY_BUFFER, eglglessink->eglglesctx->texpos_buffer);
if (got_gl_error ("glBindBuffer tdata")) if (got_gl_error ("glBindBuffer texpos_buffer"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glBufferData (GL_ARRAY_BUFFER, sizeof (eglglessink->eglglesctx->texarray), glBufferData (GL_ARRAY_BUFFER,
eglglessink->eglglesctx->texarray, GL_STATIC_DRAW); sizeof (eglglessink->eglglesctx->texpos_array),
if (got_gl_error ("glBufferData tdata")) eglglessink->eglglesctx->texpos_array, GL_STATIC_DRAW);
if (got_gl_error ("glBufferData texpos_buffer"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glVertexAttribPointer (eglglessink->eglglesctx->tex_pos, 2, GL_FLOAT, glVertexAttribPointer (eglglessink->eglglesctx->texpos_loc, 2, GL_FLOAT,
GL_FALSE, 0, 0); GL_FALSE, 0, 0);
if (got_gl_error ("glVertexAttribPointer")) if (got_gl_error ("glVertexAttribPointer"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glEnableVertexAttribArray (eglglessink->eglglesctx->tex_pos); glEnableVertexAttribArray (eglglessink->eglglesctx->texpos_loc);
if (got_gl_error ("glEnableVertexAttribArray")) if (got_gl_error ("glEnableVertexAttribArray"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glBindBuffer (GL_ELEMENT_ARRAY_BUFFER, eglglessink->eglglesctx->idata); glBindBuffer (GL_ELEMENT_ARRAY_BUFFER,
if (got_gl_error ("glBindBuffer idata")) eglglessink->eglglesctx->index_buffer);
if (got_gl_error ("glBindBuffer index_buffer"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
glBufferData (GL_ELEMENT_ARRAY_BUFFER, glBufferData (GL_ELEMENT_ARRAY_BUFFER,
sizeof (eglglessink->eglglesctx->indexarray), sizeof (eglglessink->eglglesctx->index_array),
eglglessink->eglglesctx->indexarray, GL_STATIC_DRAW); eglglessink->eglglesctx->index_array, GL_STATIC_DRAW);
if (got_gl_error ("glBufferData idata")) if (got_gl_error ("glBufferData index_buffer"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
eglglessink->have_vbo = TRUE; eglglessink->have_vbo = TRUE;
@ -1607,9 +1610,9 @@ gst_eglglessink_init_egl_surface (GstEglGlesSink * eglglessink)
if (got_gl_error ("glUseProgram")) if (got_gl_error ("glUseProgram"))
goto HANDLE_ERROR; goto HANDLE_ERROR;
eglglessink->eglglesctx->coord_pos = eglglessink->eglglesctx->position_loc =
glGetAttribLocation (eglglessink->eglglesctx->glslprogram, "position"); glGetAttribLocation (eglglessink->eglglesctx->glslprogram, "position");
eglglessink->eglglesctx->tex_pos = eglglessink->eglglesctx->texpos_loc =
glGetAttribLocation (eglglessink->eglglesctx->glslprogram, "texpos"); glGetAttribLocation (eglglessink->eglglesctx->glslprogram, "texpos");
/* Generate and bind texture */ /* Generate and bind texture */
@ -1636,10 +1639,10 @@ gst_eglglessink_init_egl_surface (GstEglGlesSink * eglglessink)
if (got_gl_error ("glBindTexture")) if (got_gl_error ("glBindTexture"))
goto HANDLE_ERROR_LOCKED; goto HANDLE_ERROR_LOCKED;
eglglessink->eglglesctx->tex_uniform[i] = eglglessink->eglglesctx->tex_loc[i] =
glGetUniformLocation (eglglessink->eglglesctx->glslprogram, glGetUniformLocation (eglglessink->eglglesctx->glslprogram,
texnames[i]); texnames[i]);
glUniform1i (eglglessink->eglglesctx->tex_uniform[i], i); glUniform1i (eglglessink->eglglesctx->tex_loc[i], i);
/* Set 2D resizing params */ /* Set 2D resizing params */
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@ -2143,9 +2146,9 @@ gst_eglglessink_setcaps (GstBaseSink * bsink, GstCaps * caps)
GST_DEBUG_OBJECT (eglglessink, "Caps are not compatible, reconfiguring"); GST_DEBUG_OBJECT (eglglessink, "Caps are not compatible, reconfiguring");
if (eglglessink->rendering_path == GST_EGLGLESSINK_RENDER_SLOW) { if (eglglessink->rendering_path == GST_EGLGLESSINK_RENDER_SLOW) {
glDeleteBuffers (1, &eglglessink->eglglesctx->vdata); glDeleteBuffers (1, &eglglessink->eglglesctx->position_buffer);
glDeleteBuffers (1, &eglglessink->eglglesctx->tdata); glDeleteBuffers (1, &eglglessink->eglglesctx->texpos_buffer);
glDeleteBuffers (1, &eglglessink->eglglesctx->idata); glDeleteBuffers (1, &eglglessink->eglglesctx->index_buffer);
eglglessink->have_vbo = FALSE; eglglessink->have_vbo = FALSE;
glDeleteShader (eglglessink->eglglesctx->fragshader); glDeleteShader (eglglessink->eglglesctx->fragshader);

12
ext/eglgles/gsteglglessink.h
View file

@ -113,12 +113,12 @@ struct _GstEglGlesRenderContext
gint n_textures; gint n_textures;
/* shader vars */ /* shader vars */
GLuint coord_pos, tex_pos; GLuint position_loc, texpos_loc;
GLuint tex_uniform[3]; GLuint tex_loc[3];
coord3 coordarray[4]; coord3 position_array[4];
coord2 texarray[4]; coord2 texpos_array[4];
unsigned short indexarray[4]; unsigned short index_array[4];
unsigned int vdata, tdata, idata; unsigned int position_buffer, texpos_buffer, index_buffer;
}; };
struct _GstEglGlesImageFmt struct _GstEglGlesImageFmt