From 0572c41c281cefb7b64358e57774c58692621cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 25 May 2017 13:06:03 +0300 Subject: [PATCH] gl: Fix indentation --- .../gl/dispmanx/gstglwindow_dispmanx_egl.c | 16 ++++++++----- gst-libs/gst/gl/gstglframebuffer.c | 3 ++- gst-libs/gst/gl/gstglmemory.c | 9 ++++--- gst-libs/gst/gl/gstglshader.c | 24 +++++++++---------- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c b/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c index 011f49fdb0..d88db2363e 100644 --- a/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c +++ b/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c @@ -130,7 +130,8 @@ gst_gl_window_dispmanx_egl_close (GstGLWindow * window) window_egl = GST_GL_WINDOW_DISPMANX_EGL (window); - if (window_egl->native.element && window_egl->native.element != window_egl->foreign.element) { + if (window_egl->native.element + && window_egl->native.element != window_egl->foreign.element) { dispman_update = vc_dispmanx_update_start (0); vc_dispmanx_element_remove (dispman_update, window_egl->native.element); vc_dispmanx_update_submit_sync (dispman_update); @@ -184,10 +185,11 @@ gst_gl_window_dispmanx_egl_set_window_handle (GstGLWindow * window, guintptr handle) { GstGLWindowDispmanxEGL *window_egl = GST_GL_WINDOW_DISPMANX_EGL (window); - EGL_DISPMANX_WINDOW_T *foreign_window = (EGL_DISPMANX_WINDOW_T *)handle; + EGL_DISPMANX_WINDOW_T *foreign_window = (EGL_DISPMANX_WINDOW_T *) handle; DISPMANX_UPDATE_HANDLE_T dispman_update; - GST_DEBUG_OBJECT (window, "set window handle with size %dx%d", foreign_window->width, foreign_window->height); + GST_DEBUG_OBJECT (window, "set window handle with size %dx%d", + foreign_window->width, foreign_window->height); if (window_egl->native.element) { dispman_update = vc_dispmanx_update_start (0); @@ -195,9 +197,11 @@ gst_gl_window_dispmanx_egl_set_window_handle (GstGLWindow * window, vc_dispmanx_update_submit_sync (dispman_update); } - window_egl->native.element = window_egl->foreign.element = foreign_window->element; - window_egl->native.width = window_egl->foreign.width = foreign_window->width; - window_egl->native.height = window_egl->foreign.height = foreign_window->height; + window_egl->native.element = window_egl->foreign.element = + foreign_window->element; + window_egl->native.width = window_egl->foreign.width = foreign_window->width; + window_egl->native.height = window_egl->foreign.height = + foreign_window->height; } static void diff --git a/gst-libs/gst/gl/gstglframebuffer.c b/gst-libs/gst/gl/gstglframebuffer.c index dfc8e352c3..678bcb7cbf 100644 --- a/gst-libs/gst/gl/gstglframebuffer.c +++ b/gst-libs/gst/gl/gstglframebuffer.c @@ -515,7 +515,8 @@ gst_gl_framebuffer_get_effective_dimensions (GstGLFramebuffer * fb, * Since: 1.10 */ gboolean -gst_gl_context_check_framebuffer_status (GstGLContext * context, GLenum fbo_target) +gst_gl_context_check_framebuffer_status (GstGLContext * context, + GLenum fbo_target) { g_return_val_if_fail (GST_IS_GL_CONTEXT (context), FALSE); diff --git a/gst-libs/gst/gl/gstglmemory.c b/gst-libs/gst/gl/gstglmemory.c index c762a9fb31..02848f0b72 100644 --- a/gst-libs/gst/gl/gstglmemory.c +++ b/gst-libs/gst/gl/gstglmemory.c @@ -684,7 +684,8 @@ gst_gl_memory_copy_teximage (GstGLMemory * src, guint tex_id, gl->FramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, gst_gl_texture_target_to_gl (src->tex_target), src_tex_id, 0); - if (!gst_gl_context_check_framebuffer_status (src->mem.context, GL_FRAMEBUFFER)) + if (!gst_gl_context_check_framebuffer_status (src->mem.context, + GL_FRAMEBUFFER)) goto fbo_error; gl->BindTexture (out_tex_target, tex_id); @@ -713,7 +714,8 @@ gst_gl_memory_copy_teximage (GstGLMemory * src, guint tex_id, gl->FramebufferTexture2D (GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, gst_gl_texture_target_to_gl (src->tex_target), src_tex_id, 0); - if (!gst_gl_context_check_framebuffer_status (src->mem.context, GL_READ_FRAMEBUFFER)) + if (!gst_gl_context_check_framebuffer_status (src->mem.context, + GL_READ_FRAMEBUFFER)) goto fbo_error; gl->BindFramebuffer (GL_DRAW_FRAMEBUFFER, fbo[1]); @@ -721,7 +723,8 @@ gst_gl_memory_copy_teximage (GstGLMemory * src, guint tex_id, gl->FramebufferTexture2D (GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, gst_gl_texture_target_to_gl (src->tex_target), tex_id, 0); - if (!gst_gl_context_check_framebuffer_status (src->mem.context, GL_DRAW_FRAMEBUFFER)) + if (!gst_gl_context_check_framebuffer_status (src->mem.context, + GL_DRAW_FRAMEBUFFER)) goto fbo_error; gl->BindTexture (out_tex_target, tex_id); diff --git a/gst-libs/gst/gl/gstglshader.c b/gst-libs/gst/gl/gstglshader.c index c665296eba..c9f86aa37b 100644 --- a/gst-libs/gst/gl/gstglshader.c +++ b/gst-libs/gst/gl/gstglshader.c @@ -49,22 +49,22 @@ typedef struct _GstGLShaderVTable { - GLuint (GSTGLAPI *CreateProgram) (void); - void (GSTGLAPI *DeleteProgram) (GLuint program); - void (GSTGLAPI *UseProgram) (GLuint program); - void (GSTGLAPI *GetAttachedShaders) (GLuint program, GLsizei maxcount, + GLuint (GSTGLAPI * CreateProgram) (void); + void (GSTGLAPI * DeleteProgram) (GLuint program); + void (GSTGLAPI * UseProgram) (GLuint program); + void (GSTGLAPI * GetAttachedShaders) (GLuint program, GLsizei maxcount, GLsizei * count, GLuint * shaders); - GLuint (GSTGLAPI *CreateShader) (GLenum shaderType); - void (GSTGLAPI *DeleteShader) (GLuint shader); - void (GSTGLAPI *AttachShader) (GLuint program, GLuint shader); - void (GSTGLAPI *DetachShader) (GLuint program, GLuint shader); + GLuint (GSTGLAPI * CreateShader) (GLenum shaderType); + void (GSTGLAPI * DeleteShader) (GLuint shader); + void (GSTGLAPI * AttachShader) (GLuint program, GLuint shader); + void (GSTGLAPI * DetachShader) (GLuint program, GLuint shader); - void (GSTGLAPI *GetShaderiv) (GLuint program, GLenum pname, GLint * params); - void (GSTGLAPI *GetProgramiv) (GLuint program, GLenum pname, GLint * params); - void (GSTGLAPI *GetShaderInfoLog) (GLuint shader, GLsizei maxLength, + void (GSTGLAPI * GetShaderiv) (GLuint program, GLenum pname, GLint * params); + void (GSTGLAPI * GetProgramiv) (GLuint program, GLenum pname, GLint * params); + void (GSTGLAPI * GetShaderInfoLog) (GLuint shader, GLsizei maxLength, GLsizei * length, char *log); - void (GSTGLAPI *GetProgramInfoLog) (GLuint shader, GLsizei maxLength, + void (GSTGLAPI * GetProgramInfoLog) (GLuint shader, GLsizei maxLength, GLsizei * length, char *log); } GstGLShaderVTable;