diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 15:57:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 16:26:24 +0300 |
commit | 665acf22bd86f5fa9367da2e2f19d57665dfebf6 (patch) | |
tree | df59a98b4dd2152b02cfa8dfdc893c2822d95fba /source/blender/gpu | |
parent | d4c851b9765dc71f5633496fdf23bcae610f4ee8 (diff) |
Cleanup: commas at the end of enums
Without this clang-format may wrap them onto a single line.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/GPU_basic_shader.h | 4 | ||||
-rw-r--r-- | source/blender/gpu/GPU_extensions.h | 6 | ||||
-rw-r--r-- | source/blender/gpu/GPU_material.h | 6 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 4 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_codegen.h | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/gpu/GPU_basic_shader.h b/source/blender/gpu/GPU_basic_shader.h index 230a5defe7b..8a97b72a3a8 100644 --- a/source/blender/gpu/GPU_basic_shader.h +++ b/source/blender/gpu/GPU_basic_shader.h @@ -53,7 +53,7 @@ typedef enum GPUBasicShaderOption { GPU_SHADER_LINE = (1 << 7), /* draw lines */ GPU_SHADER_FLAT_NORMAL = (1 << 8), /* use flat normals */ GPU_SHADER_OPTIONS_NUM = 9, - GPU_SHADER_OPTION_COMBINATIONS = (1 << GPU_SHADER_OPTIONS_NUM) + GPU_SHADER_OPTION_COMBINATIONS = (1 << GPU_SHADER_OPTIONS_NUM), } GPUBasicShaderOption; /* Keep these in sync with gpu_shader_basic_frag.glsl */ @@ -69,7 +69,7 @@ typedef enum GPUBasicShaderStipple { GPU_SHADER_STIPPLE_S3D_INTERLACE_COLUMN = 8, GPU_SHADER_STIPPLE_S3D_INTERLACE_COLUMN_SWAP = 9, GPU_SHADER_STIPPLE_S3D_INTERLACE_CHECKER = 10, - GPU_SHADER_STIPPLE_S3D_INTERLACE_CHECKER_SWAP = 11 + GPU_SHADER_STIPPLE_S3D_INTERLACE_CHECKER_SWAP = 11, } GPUBasicShaderStipple; void GPU_basic_shaders_init(void); diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h index 31ad8243c4b..75c37702fd2 100644 --- a/source/blender/gpu/GPU_extensions.h +++ b/source/blender/gpu/GPU_extensions.h @@ -69,21 +69,21 @@ typedef enum GPUDeviceType { GPU_DEVICE_INTEL = (1 << 2), GPU_DEVICE_SOFTWARE = (1 << 3), GPU_DEVICE_UNKNOWN = (1 << 4), - GPU_DEVICE_ANY = (0xff) + GPU_DEVICE_ANY = (0xff), } GPUDeviceType; typedef enum GPUOSType { GPU_OS_WIN = (1 << 8), GPU_OS_MAC = (1 << 9), GPU_OS_UNIX = (1 << 10), - GPU_OS_ANY = (0xff00) + GPU_OS_ANY = (0xff00), } GPUOSType; typedef enum GPUDriverType { GPU_DRIVER_OFFICIAL = (1 << 16), GPU_DRIVER_OPENSOURCE = (1 << 17), GPU_DRIVER_SOFTWARE = (1 << 18), - GPU_DRIVER_ANY = (0xff0000) + GPU_DRIVER_ANY = (0xff0000), } GPUDriverType; bool GPU_type_matches(GPUDeviceType device, GPUOSType os, GPUDriverType driver); diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index c94d6429f59..e0e92976b09 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -80,7 +80,7 @@ typedef enum GPUType { GPU_TEX2D = 1002, GPU_SHADOW2D = 1003, GPU_TEXCUBE = 1004, - GPU_ATTRIB = 3001 + GPU_ATTRIB = 3001, } GPUType; typedef enum GPUBuiltin { @@ -99,7 +99,7 @@ typedef enum GPUBuiltin { GPU_PARTICLE_ANG_VELOCITY = (1 << 12), GPU_LOC_TO_VIEW_MATRIX = (1 << 13), GPU_INVERSE_LOC_TO_VIEW_MATRIX = (1 << 14), - GPU_OBJECT_INFO = (1 << 15) + GPU_OBJECT_INFO = (1 << 15), } GPUBuiltin; typedef enum GPUOpenGLBuiltin { @@ -119,7 +119,7 @@ typedef enum GPUBlendMode { GPU_BLEND_ALPHA = 2, GPU_BLEND_CLIP = 4, GPU_BLEND_ALPHA_SORT = 8, - GPU_BLEND_ALPHA_TO_COVERAGE = 16 + GPU_BLEND_ALPHA_TO_COVERAGE = 16, } GPUBlendMode; typedef struct GPUNodeStack { diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index d1e74fc8b3f..e00a550fb06 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -66,10 +66,10 @@ static char *glsl_material_library = NULL; /* type definitions and constants */ enum { - MAX_FUNCTION_NAME = 64 + MAX_FUNCTION_NAME = 64, }; enum { - MAX_PARAMETER = 32 + MAX_PARAMETER = 32, }; typedef enum { diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index ec2ff7615d5..2f3b25c90f7 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -64,7 +64,7 @@ typedef enum { GPU_NODE_LINK_IMAGE_NONE = 0, GPU_NODE_LINK_IMAGE_BLENDER = 1, GPU_NODE_LINK_IMAGE_PREVIEW = 2, - GPU_NODE_LINK_IMAGE_CUBE_MAP = 3 + GPU_NODE_LINK_IMAGE_CUBE_MAP = 3, } GPUNodeLinkImage; struct GPUNode { |