diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-07-28 17:32:30 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-07-28 17:33:43 +0300 |
| commit | b274d18aec525621bcb0a2234fc65e09398616c2 (patch) | |
| tree | ec4310013623197f5bac2eb51c200503d898bd06 /source/blender/gpu/GPU_texture.h | |
| parent | 9c1da81a4c173437c1e556afde7b32eef4b0a47d (diff) | |
Cleanup: correct usage of extern-C blocks in various places
This removes extern-C blocks around other includes and adds
such blocks for some headers that need them.
Diffstat (limited to 'source/blender/gpu/GPU_texture.h')
| -rw-r--r-- | source/blender/gpu/GPU_texture.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index 813ee71eb22..100965d7076 100644 --- a/source/blender/gpu/GPU_texture.h +++ b/source/blender/gpu/GPU_texture.h @@ -24,12 +24,9 @@ #ifndef __GPU_TEXTURE_H__ #define __GPU_TEXTURE_H__ +#include "BLI_utildefines.h" #include "GPU_state.h" -#ifdef __cplusplus -extern "C" { -#endif - struct GPUVertBuf; struct ImBuf; struct Image; @@ -60,6 +57,12 @@ typedef enum eGPUSamplerState { GPU_SAMPLER_MAX = (1 << 8), } eGPUSamplerState; +ENUM_OPERATORS(eGPUSamplerState) + +#ifdef __cplusplus +extern "C" { +#endif + #define GPU_SAMPLER_DEFAULT GPU_SAMPLER_FILTER #define GPU_SAMPLER_REPEAT (GPU_SAMPLER_REPEAT_S | GPU_SAMPLER_REPEAT_T | GPU_SAMPLER_REPEAT_R) |