mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-09-03 18:53:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: initialize output params to 0 before calling gl functions

Browse source 
The client side API of the Chromium's GPU Process has asserts
in debug mode that check that output params are initialized to 0.
This commit is contained in:
Julien Isorce 2015-07-02 10:26:18 +01:00 committed by Tim-Philipp Müller
parent b8d3c2d2a5
commit 9b1eb32c49
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1714,7 +1714,7 @@ _do_convert_draw (GstGLContext * context, GstGLColorConvert * convert)
guint out_width, out_height; guint out_width, out_height;
gint i; gint i;
GLint viewport_dim[4]; GLint viewport_dim[4] = { 0 };
GLenum multipleRT[] = { GLenum multipleRT[] = {
GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT0,

3
gst-libs/gst/gl/gstglcontext.c
View file

@ -1179,7 +1179,8 @@ _build_extension_string (GstGLContext * context)
const GstGLFuncs *gl = context->gl_vtable; const GstGLFuncs *gl = context->gl_vtable;
GString *ext_g_str = g_string_sized_new (1024); GString *ext_g_str = g_string_sized_new (1024);
const gchar *ext_const_c_str = NULL; const gchar *ext_const_c_str = NULL;
int i, n; GLint i = 0;
GLint n = 0;
gl->GetIntegerv (GL_NUM_EXTENSIONS, &n); gl->GetIntegerv (GL_NUM_EXTENSIONS, &n);

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

@ -173,7 +173,7 @@ gst_gl_framebuffer_use_v2 (GstGLFramebuffer * frame, gint texture_fbo_width,
GLuint texture_fbo, GLCB_V2 cb, gpointer stuff) GLuint texture_fbo, GLCB_V2 cb, gpointer stuff)
{ {
const GstGLFuncs *gl; const GstGLFuncs *gl;
GLint viewport_dim[4]; GLint viewport_dim[4] = { 0 };
g_return_val_if_fail (GST_IS_GL_FRAMEBUFFER (frame), FALSE); g_return_val_if_fail (GST_IS_GL_FRAMEBUFFER (frame), FALSE);
g_return_val_if_fail (texture_fbo_width > 0 && texture_fbo_height > 0, FALSE); g_return_val_if_fail (texture_fbo_width > 0 && texture_fbo_height > 0, FALSE);

3
gst-libs/gst/gl/gstglshader.c
View file

@ -522,6 +522,7 @@ gst_gl_shader_compile (GstGLShader * shader, GError ** error)
/* compile */ /* compile */
gl->CompileShader (priv->vertex_handle); gl->CompileShader (priv->vertex_handle);
/* check everything is ok */ /* check everything is ok */
status = GL_FALSE;
gl->GetShaderiv (priv->vertex_handle, GL_COMPILE_STATUS, &status); gl->GetShaderiv (priv->vertex_handle, GL_COMPILE_STATUS, &status);
priv->vtable.GetShaderInfoLog (priv->vertex_handle, priv->vtable.GetShaderInfoLog (priv->vertex_handle,
@ -561,6 +562,7 @@ gst_gl_shader_compile (GstGLShader * shader, GError ** error)
/* compile */ /* compile */
gl->CompileShader (priv->fragment_handle); gl->CompileShader (priv->fragment_handle);
/* check everything is ok */ /* check everything is ok */
status = GL_FALSE;
priv->vtable.GetShaderiv (priv->fragment_handle, priv->vtable.GetShaderiv (priv->fragment_handle,
GL_COMPILE_STATUS, &status); GL_COMPILE_STATUS, &status);
@ -587,6 +589,7 @@ gst_gl_shader_compile (GstGLShader * shader, GError ** error)
/* if nothing failed link shaders */ /* if nothing failed link shaders */
gl->LinkProgram (priv->program_handle); gl->LinkProgram (priv->program_handle);
status = GL_FALSE;
priv->vtable.GetProgramiv (priv->program_handle, GL_LINK_STATUS, &status); priv->vtable.GetProgramiv (priv->program_handle, GL_LINK_STATUS, &status);
priv->vtable.GetProgramInfoLog (priv->program_handle, priv->vtable.GetProgramInfoLog (priv->program_handle,

2
gst-libs/gst/gl/gstglviewconvert.c
View file

@ -1586,7 +1586,7 @@ _do_view_convert_draw (GstGLContext * context, GstGLViewConvert * viewconvert)
GstGLFuncs *gl; GstGLFuncs *gl;
guint out_width, out_height; guint out_width, out_height;
gint out_views, i; gint out_views, i;
GLint viewport_dim[4]; GLint viewport_dim[4] = { 0 };
GLenum multipleRT[] = { GLenum multipleRT[] = {
GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT0,
GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT1,