diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-07-28 17:37:01 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-07-28 17:37:01 +0300 |
| commit | 814ca40c639c74c48ec5e5b1a078b3b9884a9fad (patch) | |
| tree | b50abb9b7dbd376563205a4976f27fb4bd93c006 /source/blender/gpu/GPU_texture.h | |
| parent | fcf91bbf0daefa8ffdcbae7ce707115ec4fd5eb0 (diff) | |
| parent | 67c33caeec364a9dbded75812ac7b0b76e14c203 (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/gpu/GPU_texture.h')
| -rw-r--r-- | source/blender/gpu/GPU_texture.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h index d7f5d6272f4..0f159a3774f 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; @@ -69,6 +66,10 @@ typedef enum eGPUSamplerState { GPU_SAMPLER_MAX = (1 << 8), } 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) |