From 744f6339865fa8ed00b2e98aa5812b94d67a8604 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 3 Feb 2019 14:01:45 +1100 Subject: Cleanup: trailing commas Needed for clan-format not to wrap onto one line. --- source/blender/gpu/intern/gpu_buffers.c | 4 ++-- source/blender/gpu/intern/gpu_codegen.c | 2 +- source/blender/gpu/intern/gpu_element.c | 4 ++-- source/blender/gpu/intern/gpu_framebuffer.c | 2 +- source/blender/gpu/intern/gpu_primitive.c | 2 +- source/blender/gpu/intern/gpu_vertex_buffer.c | 2 +- source/blender/gpu/intern/gpu_vertex_format.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/gpu/intern') diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 923cbed9f00..39ff880ddf8 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -456,13 +456,13 @@ void GPU_pbvh_grid_buffers_update( CCG_grid_elem(key, grid, k, j + 1), CCG_grid_elem(key, grid, k + 1, j + 1), CCG_grid_elem(key, grid, k + 1, j), - CCG_grid_elem(key, grid, k, j) + CCG_grid_elem(key, grid, k, j), }; float *co[4] = { CCG_elem_co(key, elems[0]), CCG_elem_co(key, elems[1]), CCG_elem_co(key, elems[2]), - CCG_elem_co(key, elems[3]) + CCG_elem_co(key, elems[3]), }; float fno[3]; diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index cc8c9f386a2..a1a29189687 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -146,7 +146,7 @@ typedef struct GPUFunction { /* Indices match the eGPUType enum */ static const char *GPU_DATATYPE_STR[17] = { "", "float", "vec2", "vec3", "vec4", - NULL, NULL, NULL, NULL, "mat3", NULL, NULL, NULL, NULL, NULL, NULL, "mat4" + NULL, NULL, NULL, NULL, "mat3", NULL, NULL, NULL, NULL, NULL, NULL, "mat4", }; /* GLSL code parsing for finding function definitions. diff --git a/source/blender/gpu/intern/gpu_element.c b/source/blender/gpu/intern/gpu_element.c index 34b5c8af431..73f7ca6a934 100644 --- a/source/blender/gpu/intern/gpu_element.c +++ b/source/blender/gpu/intern/gpu_element.c @@ -38,7 +38,7 @@ static GLenum convert_index_type_to_gl(GPUIndexBufType type) static const GLenum table[] = { [GPU_INDEX_U8] = GL_UNSIGNED_BYTE, /* GL has this, Vulkan does not */ [GPU_INDEX_U16] = GL_UNSIGNED_SHORT, - [GPU_INDEX_U32] = GL_UNSIGNED_INT + [GPU_INDEX_U32] = GL_UNSIGNED_INT, }; return table[type]; } @@ -49,7 +49,7 @@ uint GPU_indexbuf_size_get(const GPUIndexBuf *elem) static const uint table[] = { [GPU_INDEX_U8] = sizeof(GLubyte), /* GL has this, Vulkan does not */ [GPU_INDEX_U16] = sizeof(GLushort), - [GPU_INDEX_U32] = sizeof(GLuint) + [GPU_INDEX_U32] = sizeof(GLuint), }; return elem->index_len * table[elem->index_type]; #else diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index 727203d2a78..84d868fae09 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -78,7 +78,7 @@ static GLenum convert_attachment_type_to_gl(GPUAttachmentType type) [GPU_FB_COLOR_ATTACHMENT1] = GL_COLOR_ATTACHMENT1, [GPU_FB_COLOR_ATTACHMENT2] = GL_COLOR_ATTACHMENT2, [GPU_FB_COLOR_ATTACHMENT3] = GL_COLOR_ATTACHMENT3, - [GPU_FB_COLOR_ATTACHMENT4] = GL_COLOR_ATTACHMENT4 + [GPU_FB_COLOR_ATTACHMENT4] = GL_COLOR_ATTACHMENT4, }; return table[type]; } diff --git a/source/blender/gpu/intern/gpu_primitive.c b/source/blender/gpu/intern/gpu_primitive.c index b74800e505b..085e57e0a4d 100644 --- a/source/blender/gpu/intern/gpu_primitive.c +++ b/source/blender/gpu/intern/gpu_primitive.c @@ -41,7 +41,7 @@ GPUPrimClass GPU_primtype_class(GPUPrimType prim_type) [GPU_PRIM_LINE_STRIP_ADJ] = GPU_PRIM_CLASS_LINE, [GPU_PRIM_TRIS_ADJ] = GPU_PRIM_CLASS_SURFACE, - [GPU_PRIM_NONE] = GPU_PRIM_CLASS_NONE + [GPU_PRIM_NONE] = GPU_PRIM_CLASS_NONE, }; return classes[prim_type]; diff --git a/source/blender/gpu/intern/gpu_vertex_buffer.c b/source/blender/gpu/intern/gpu_vertex_buffer.c index d5447db8e24..53a6f520297 100644 --- a/source/blender/gpu/intern/gpu_vertex_buffer.c +++ b/source/blender/gpu/intern/gpu_vertex_buffer.c @@ -42,7 +42,7 @@ static GLenum convert_usage_type_to_gl(GPUUsageType type) static const GLenum table[] = { [GPU_USAGE_STREAM] = GL_STREAM_DRAW, [GPU_USAGE_STATIC] = GL_STATIC_DRAW, - [GPU_USAGE_DYNAMIC] = GL_DYNAMIC_DRAW + [GPU_USAGE_DYNAMIC] = GL_DYNAMIC_DRAW, }; return table[type]; } diff --git a/source/blender/gpu/intern/gpu_vertex_format.c b/source/blender/gpu/intern/gpu_vertex_format.c index 8dbe4a67599..397cadb8a53 100644 --- a/source/blender/gpu/intern/gpu_vertex_format.c +++ b/source/blender/gpu/intern/gpu_vertex_format.c @@ -78,7 +78,7 @@ static GLenum convert_comp_type_to_gl(GPUVertCompType type) [GPU_COMP_F32] = GL_FLOAT, - [GPU_COMP_I10] = GL_INT_2_10_10_10_REV + [GPU_COMP_I10] = GL_INT_2_10_10_10_REV, }; return table[type]; } -- cgit v1.2.3