diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-11 18:40:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-11 18:47:53 +0300 |
| commit | bcc8c04db4a111b692660a7706757290a5f03465 (patch) | |
| tree | 7ef37008099362ab2786be7482322157c27debb4 /source/blender/gpu | |
| parent | 98045648ab4907a9843ede70de90ef923229dacc (diff) | |
Cleanup: code style & cmake
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_debug.c | 6 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_select_private.h | 5 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_select_sample_query.c | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c index d632e767ca9..ba68d1a6a0f 100644 --- a/source/blender/gpu/intern/gpu_debug.c +++ b/source/blender/gpu/intern/gpu_debug.c @@ -161,7 +161,7 @@ const char *gpuErrorString(GLenum err) #endif -static const char* source_name(GLenum source) +static const char *source_name(GLenum source) { switch (source) { case GL_DEBUG_SOURCE_API: return "API"; @@ -174,7 +174,7 @@ static const char* source_name(GLenum source) } } -static const char* message_type_name(GLenum message) +static const char *message_type_name(GLenum message) { switch (message) { case GL_DEBUG_TYPE_ERROR: return "error"; @@ -188,7 +188,7 @@ static const char* message_type_name(GLenum message) } } -static const char* category_name_amd(GLenum category) +static const char *category_name_amd(GLenum category) { switch (category) { case GL_DEBUG_CATEGORY_API_ERROR_AMD: return "API error"; diff --git a/source/blender/gpu/intern/gpu_select_private.h b/source/blender/gpu/intern/gpu_select_private.h index 631b8806af9..8935bd7b253 100644 --- a/source/blender/gpu/intern/gpu_select_private.h +++ b/source/blender/gpu/intern/gpu_select_private.h @@ -29,6 +29,9 @@ * Selection implementations. */ +#ifndef __GPU_SELECT_PRIVATE_H__ +#define __GPU_SELECT_PRIVATE_H__ + /* gpu_select_pick */ void gpu_select_pick_begin(unsigned int (*buffer)[4], unsigned int bufsize, const rcti *input, char mode); bool gpu_select_pick_load_id(unsigned int id); @@ -46,3 +49,5 @@ unsigned int gpu_select_query_end(void); #define SELECT_ID_NONE ((unsigned int)0xffffffff) + +#endif /* __GPU_SELECT_PRIVATE_H__ */ diff --git a/source/blender/gpu/intern/gpu_select_sample_query.c b/source/blender/gpu/intern/gpu_select_sample_query.c index 5576367edd9..ba5fefc5227 100644 --- a/source/blender/gpu/intern/gpu_select_sample_query.c +++ b/source/blender/gpu/intern/gpu_select_sample_query.c @@ -23,7 +23,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/gpu/intern/gpu_select.c +/** \file blender/gpu/intern/gpu_select_sample_query.c * \ingroup gpu * * Interface for accessing gpu-related methods for selection. The semantics will be |