jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang-format: Apply formatting

Browse Source 
Code submissions have continually suffered from formatting
inconsistencies that constantly have to be addressed.  Using
clang-format simplifies this by making code formatting more consistent,
and allows automation of the code formatting so that maintainers can
focus more on the code itself instead of code formatting.
This commit is contained in:
jp9000
2019-06-22 22:13:45 -07:00
parent 53615ee10f
commit f53df7da64
567 changed files with 34068 additions and 32903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
libobs-opengl/gl-texture2d.c
View File

@@ -19,11 +19,11 @@
static bool upload_texture_2d(struct gs_texture_2d *tex, const uint8_t **data)
{
uint32_t row_size = tex->width * gs_get_format_bpp(tex->base.format);
uint32_t tex_size = tex->height * row_size / 8;
uint32_t row_size = tex->width * gs_get_format_bpp(tex->base.format);
uint32_t tex_size = tex->height * row_size / 8;
uint32_t num_levels = tex->base.levels;
bool compressed = gs_is_compressed_format(tex->base.format);
bool success;
bool compressed = gs_is_compressed_format(tex->base.format);
bool success;
if (!num_levels)
num_levels = gs_get_total_levels(tex->width, tex->height);
@@ -32,10 +32,12 @@ static bool upload_texture_2d(struct gs_texture_2d *tex, const uint8_t **data)
return false;
success = gl_init_face(GL_TEXTURE_2D, tex->base.gl_type, num_levels,
tex->base.gl_format, tex->base.gl_internal_format,
compressed, tex->width, tex->height, tex_size, &data);
tex->base.gl_format,
tex->base.gl_internal_format, compressed,
tex->width, tex->height, tex_size, &data);
if (!gl_tex_param_i(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, num_levels-1))
if (!gl_tex_param_i(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL,
num_levels - 1))
success = false;
if (!gl_bind_texture(GL_TEXTURE_2D, 0))
success = false;
@@ -57,7 +59,7 @@ static bool create_pixel_unpack_buffer(struct gs_texture_2d *tex)
size = tex->width * gs_get_format_bpp(tex->base.format);
if (!gs_is_compressed_format(tex->base.format)) {
size /= 8;
size = (size+3) & 0xFFFFFFFC;
size = (size + 3) & 0xFFFFFFFC;
size *= tex->height;
} else {
size *= tex->height;
@@ -75,24 +77,26 @@ static bool create_pixel_unpack_buffer(struct gs_texture_2d *tex)
}
gs_texture_t *device_texture_create(gs_device_t *device, uint32_t width,
uint32_t height, enum gs_color_format color_format,
uint32_t levels, const uint8_t **data, uint32_t flags)
uint32_t height,
enum gs_color_format color_format,
uint32_t levels, const uint8_t **data,
uint32_t flags)
{
struct gs_texture_2d *tex = bzalloc(sizeof(struct gs_texture_2d));
tex->base.device = device;
tex->base.type = GS_TEXTURE_2D;
tex->base.format = color_format;
tex->base.levels = levels;
tex->base.gl_format = convert_gs_format(color_format);
tex->base.device = device;
tex->base.type = GS_TEXTURE_2D;
tex->base.format = color_format;
tex->base.levels = levels;
tex->base.gl_format = convert_gs_format(color_format);
tex->base.gl_internal_format = convert_gs_internal_format(color_format);
tex->base.gl_type = get_gl_format_type(color_format);
tex->base.gl_target = GL_TEXTURE_2D;
tex->base.is_dynamic = (flags & GS_DYNAMIC) != 0;
tex->base.is_render_target = (flags & GS_RENDER_TARGET) != 0;
tex->base.is_dummy = (flags & GS_GL_DUMMYTEX) != 0;
tex->base.gen_mipmaps = (flags & GS_BUILD_MIPMAPS) != 0;
tex->width = width;
tex->height = height;
tex->base.gl_type = get_gl_format_type(color_format);
tex->base.gl_target = GL_TEXTURE_2D;
tex->base.is_dynamic = (flags & GS_DYNAMIC) != 0;
tex->base.is_render_target = (flags & GS_RENDER_TARGET) != 0;
tex->base.is_dummy = (flags & GS_GL_DUMMYTEX) != 0;
tex->base.gen_mipmaps = (flags & GS_BUILD_MIPMAPS) != 0;
tex->width = width;
tex->height = height;
if (!gl_gen_textures(1, &tex->base.texture))
goto fail;
@@ -104,10 +108,10 @@ gs_texture_t *device_texture_create(gs_device_t *device, uint32_t width,
goto fail;
}
return (gs_texture_t*)tex;
return (gs_texture_t *)tex;
fail:
gs_texture_destroy((gs_texture_t*)tex);
gs_texture_destroy((gs_texture_t *)tex);
blog(LOG_ERROR, "device_texture_create (GL) failed");
return NULL;
}
@@ -122,7 +126,7 @@ static inline bool is_texture_2d(const gs_texture_t *tex, const char *func)
void gs_texture_destroy(gs_texture_t *tex)
{
struct gs_texture_2d *tex2d = (struct gs_texture_2d*)tex;
struct gs_texture_2d *tex2d = (struct gs_texture_2d *)tex;
if (!tex)
return;
@@ -146,7 +150,7 @@ void gs_texture_destroy(gs_texture_t *tex)
uint32_t gs_texture_get_width(const gs_texture_t *tex)
{
const struct gs_texture_2d *tex2d = (const struct gs_texture_2d*)tex;
const struct gs_texture_2d *tex2d = (const struct gs_texture_2d *)tex;
if (!is_texture_2d(tex, "gs_texture_get_width"))
return 0;
@@ -155,7 +159,7 @@ uint32_t gs_texture_get_width(const gs_texture_t *tex)
uint32_t gs_texture_get_height(const gs_texture_t *tex)
{
const struct gs_texture_2d *tex2d = (const struct gs_texture_2d*)tex;
const struct gs_texture_2d *tex2d = (const struct gs_texture_2d *)tex;
if (!is_texture_2d(tex, "gs_texture_get_height"))
return 0;
@@ -169,7 +173,7 @@ enum gs_color_format gs_texture_get_color_format(const gs_texture_t *tex)
bool gs_texture_map(gs_texture_t *tex, uint8_t **ptr, uint32_t *linesize)
{
struct gs_texture_2d *tex2d = (struct gs_texture_2d*)tex;
struct gs_texture_2d *tex2d = (struct gs_texture_2d *)tex;
if (!is_texture_2d(tex, "gs_texture_map"))
goto fail;
@@ -199,7 +203,7 @@ fail:
void gs_texture_unmap(gs_texture_t *tex)
{
struct gs_texture_2d *tex2d = (struct gs_texture_2d*)tex;
struct gs_texture_2d *tex2d = (struct gs_texture_2d *)tex;
if (!is_texture_2d(tex, "gs_texture_unmap"))
goto failed;
@@ -213,9 +217,8 @@ void gs_texture_unmap(gs_texture_t *tex)
if (!gl_bind_texture(GL_TEXTURE_2D, tex2d->base.texture))
goto failed;
glTexImage2D(GL_TEXTURE_2D, 0, tex->gl_internal_format,
tex2d->width, tex2d->height, 0,
tex->gl_format, tex->gl_type, 0);
glTexImage2D(GL_TEXTURE_2D, 0, tex->gl_internal_format, tex2d->width,
tex2d->height, 0, tex->gl_format, tex->gl_type, 0);
if (!gl_success("glTexImage2D"))
goto failed;
@@ -231,7 +234,7 @@ failed:
bool gs_texture_is_rect(const gs_texture_t *tex)
{
const struct gs_texture_2d *tex2d = (const struct gs_texture_2d*)tex;
const struct gs_texture_2d *tex2d = (const struct gs_texture_2d *)tex;
if (!is_texture_2d(tex, "gs_texture_unmap")) {
blog(LOG_ERROR, "gs_texture_is_rect (GL) failed");
return false;
@@ -242,7 +245,7 @@ bool gs_texture_is_rect(const gs_texture_t *tex)
void *gs_texture_get_obj(gs_texture_t *tex)
{
struct gs_texture_2d *tex2d = (struct gs_texture_2d*)tex;
struct gs_texture_2d *tex2d = (struct gs_texture_2d *)tex;
if (!is_texture_2d(tex, "gs_texture_unmap")) {
blog(LOG_ERROR, "gs_texture_get_obj (GL) failed");
return NULL;