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:03:03 +0300 |
| commit | 88a80fcec8672b5bb67041456dc7f7101aae3d55 (patch) | |
| tree | e1b93fd997bba2e0481395bb51b51058eb9aa990 /source/blender/gpu | |
| parent | 2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01 (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_extensions.h | 6 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 4 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_primitive.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h index 22eb917f0bd..b51363a6941 100644 --- a/source/blender/gpu/GPU_extensions.h +++ b/source/blender/gpu/GPU_extensions.h @@ -70,21 +70,21 @@ typedef enum GPUDeviceType { GPU_DEVICE_INTEL_UHD = (1 << 3), GPU_DEVICE_SOFTWARE = (1 << 4), GPU_DEVICE_UNKNOWN = (1 << 5), - 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 c2e8dcd2ab6..7e201cd1ebc 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -90,7 +90,7 @@ typedef enum GPUType { GPU_CLOSURE = 1006, /* Opengl Attributes */ - GPU_ATTRIB = 3001 + GPU_ATTRIB = 3001, } GPUType; typedef enum GPUBuiltin { @@ -130,7 +130,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/GPU_primitive.h b/source/blender/gpu/GPU_primitive.h index bcedfa56ab1..1fb81253c4d 100644 --- a/source/blender/gpu/GPU_primitive.h +++ b/source/blender/gpu/GPU_primitive.h @@ -56,7 +56,7 @@ typedef enum { GPU_PRIM_CLASS_POINT = (1 << 0), GPU_PRIM_CLASS_LINE = (1 << 1), GPU_PRIM_CLASS_SURFACE = (1 << 2), - GPU_PRIM_CLASS_ANY = GPU_PRIM_CLASS_POINT | GPU_PRIM_CLASS_LINE | GPU_PRIM_CLASS_SURFACE + GPU_PRIM_CLASS_ANY = GPU_PRIM_CLASS_POINT | GPU_PRIM_CLASS_LINE | GPU_PRIM_CLASS_SURFACE, } GPUPrimClass; GPUPrimClass GPU_primtype_class(GPUPrimType); diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index e4a55943999..1137c382593 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -133,7 +133,7 @@ struct GPUMaterial { enum { GPU_DOMAIN_SURFACE = (1 << 0), GPU_DOMAIN_VOLUME = (1 << 1), - GPU_DOMAIN_SSS = (1 << 2) + GPU_DOMAIN_SSS = (1 << 2), }; /* Functions */ |