Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-16 17:40:47 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-16 17:40:47 +0300
commitdbc058301bf516a53b92b9c45b5c4f3ecc33ecf4 (patch)
treed93fb65825e40300f68707ae75718773bc73678f /source/blender/gpu
parentd217b23f735cb9232d86c7730ed0a0aa45e3074e (diff)
Cleanup: trailing commas
Diffstat (limited to 'source/blender/gpu')
-rw-r--r--source/blender/gpu/GPU_batch.h2
-rw-r--r--source/blender/gpu/GPU_element.h2
-rw-r--r--source/blender/gpu/GPU_primitive.h2
-rw-r--r--source/blender/gpu/GPU_state.h2
-rw-r--r--source/blender/gpu/GPU_vertex_buffer.h2
-rw-r--r--source/blender/gpu/GPU_vertex_format.h4
-rw-r--r--source/blender/gpu/intern/gpu_codegen.c2
-rw-r--r--source/blender/gpu/intern/gpu_framebuffer.c2
8 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h
index d789a65a3a4..9f6c9f50109 100644
--- a/source/blender/gpu/GPU_batch.h
+++ b/source/blender/gpu/GPU_batch.h
@@ -36,7 +36,7 @@ typedef enum {
GPU_BATCH_READY_TO_FORMAT,
GPU_BATCH_READY_TO_BUILD,
GPU_BATCH_BUILDING,
- GPU_BATCH_READY_TO_DRAW
+ GPU_BATCH_READY_TO_DRAW,
} GPUBatchPhase;
#define GPU_BATCH_VBO_MAX_LEN 4
diff --git a/source/blender/gpu/GPU_element.h b/source/blender/gpu/GPU_element.h
index 96d9acc55a8..5c877c80f65 100644
--- a/source/blender/gpu/GPU_element.h
+++ b/source/blender/gpu/GPU_element.h
@@ -35,7 +35,7 @@
typedef enum {
GPU_INDEX_U8, /* GL has this, Vulkan does not */
GPU_INDEX_U16,
- GPU_INDEX_U32
+ GPU_INDEX_U32,
} GPUIndexBufType;
typedef struct GPUIndexBuf {
diff --git a/source/blender/gpu/GPU_primitive.h b/source/blender/gpu/GPU_primitive.h
index 5867e589ebe..fdb6f380f3b 100644
--- a/source/blender/gpu/GPU_primitive.h
+++ b/source/blender/gpu/GPU_primitive.h
@@ -41,7 +41,7 @@ typedef enum {
GPU_PRIM_TRIS_ADJ,
GPU_PRIM_LINE_STRIP_ADJ,
- GPU_PRIM_NONE
+ GPU_PRIM_NONE,
} GPUPrimType;
/* what types of primitives does each shader expect? */
diff --git a/source/blender/gpu/GPU_state.h b/source/blender/gpu/GPU_state.h
index eb273608a3f..23682815e4c 100644
--- a/source/blender/gpu/GPU_state.h
+++ b/source/blender/gpu/GPU_state.h
@@ -33,7 +33,7 @@ typedef enum eGPUBlendFunction {
/* These map directly to the GL_ filter functions, to minimize API add as needed*/
typedef enum eGPUFilterFunction {
GPU_NEAREST,
- GPU_LINEAR
+ GPU_LINEAR,
} eGPUFilterFunction;
void GPU_blend(bool enable);
diff --git a/source/blender/gpu/GPU_vertex_buffer.h b/source/blender/gpu/GPU_vertex_buffer.h
index 4c1814a9d9b..c7ef337261f 100644
--- a/source/blender/gpu/GPU_vertex_buffer.h
+++ b/source/blender/gpu/GPU_vertex_buffer.h
@@ -43,7 +43,7 @@ typedef enum {
/* can be extended to support more types */
GPU_USAGE_STREAM,
GPU_USAGE_STATIC, /* do not keep data in memory */
- GPU_USAGE_DYNAMIC
+ GPU_USAGE_DYNAMIC,
} GPUUsageType;
typedef struct GPUVertBuf {
diff --git a/source/blender/gpu/GPU_vertex_format.h b/source/blender/gpu/GPU_vertex_format.h
index 63ff430033b..ce70430dcca 100644
--- a/source/blender/gpu/GPU_vertex_format.h
+++ b/source/blender/gpu/GPU_vertex_format.h
@@ -43,14 +43,14 @@ typedef enum {
GPU_COMP_F32,
- GPU_COMP_I10
+ GPU_COMP_I10,
} GPUVertCompType;
typedef enum {
GPU_FETCH_FLOAT,
GPU_FETCH_INT,
GPU_FETCH_INT_TO_FLOAT_UNIT, /* 127 (ubyte) -> 0.5 (and so on for other int types) */
- GPU_FETCH_INT_TO_FLOAT /* 127 (any int type) -> 127.0 */
+ GPU_FETCH_INT_TO_FLOAT, /* 127 (any int type) -> 127.0 */
} GPUVertFetchMode;
typedef struct GPUVertAttr {
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index 552ae8f4cd7..84164045984 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -133,7 +133,7 @@ static GPUPass *gpu_pass_cache_resolve_collision(
typedef enum {
FUNCTION_QUAL_IN,
FUNCTION_QUAL_OUT,
- FUNCTION_QUAL_INOUT
+ FUNCTION_QUAL_INOUT,
} GPUFunctionQual;
typedef struct GPUFunction {
diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c
index 83acdf6a756..c5ed3f8e01d 100644
--- a/source/blender/gpu/intern/gpu_framebuffer.c
+++ b/source/blender/gpu/intern/gpu_framebuffer.c
@@ -51,7 +51,7 @@ typedef enum {
* We support 5 outputs for now (usually we wouldn't need more to preserve fill rate). */
/* Keep in mind that GL max is GL_MAX_DRAW_BUFFERS and is at least 8, corresponding to
* the maximum number of COLOR attachments specified by glDrawBuffers. */
- GPU_FB_MAX_ATTACHEMENT
+ GPU_FB_MAX_ATTACHEMENT,
} GPUAttachmentType;
#define GPU_FB_MAX_COLOR_ATTACHMENT (GPU_FB_MAX_ATTACHEMENT - GPU_FB_COLOR_ATTACHMENT0)