diff options
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/GPU_framebuffer.h | 4 | ||||
-rw-r--r-- | source/blender/gpu/GPU_texture.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/gpu/GPU_framebuffer.h b/source/blender/gpu/GPU_framebuffer.h index ef6be0b2778..db531cdef9b 100644 --- a/source/blender/gpu/GPU_framebuffer.h +++ b/source/blender/gpu/GPU_framebuffer.h @@ -24,12 +24,12 @@ #ifndef __GPU_FRAMEBUFFER_H__ #define __GPU_FRAMEBUFFER_H__ +#include "GPU_texture.h" + #ifdef __cplusplus extern "C" { #endif -#include "GPU_texture.h" - typedef struct GPUAttachment { struct GPUTexture *tex; int layer, mip; 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) |