Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use regular header guards in GPU

Browse Source
This commit is contained in:
Campbell Barton
2017-04-13 19:10:55 +10:00
parent 1c426d5b6c
commit ffa63d2de6
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/gpu/GPU_batch.h
View File

@@ -28,7 +28,8 @@
* This file contains any additions or modifications specific to Blender. * This file contains any additions or modifications specific to Blender.
*/ */
#pragma once #ifndef __GPU_BATCH_H__
#define __GPU_BATCH_H__
#include "../../../intern/gawain/gawain/batch.h" #include "../../../intern/gawain/gawain/batch.h"
@@ -46,3 +47,5 @@ Batch *Batch_get_sphere_wire(int lod);
void gpu_batch_init(void); void gpu_batch_init(void);
void gpu_batch_exit(void); void gpu_batch_exit(void);
#endif /* __GPU_BATCH_H__ */

4
source/blender/gpu/GPU_immediate.h
View File

@@ -28,7 +28,8 @@
* This file contains any additions or modifications specific to Blender. * This file contains any additions or modifications specific to Blender.
*/ */
#pragma once #ifndef __GPU_IMMEDIATE_H__
#define __GPU_IMMEDIATE_H__
#include "../../../intern/gawain/gawain/immediate.h" #include "../../../intern/gawain/gawain/immediate.h"
#include "../../../intern/gawain/gawain/imm_util.h" #include "../../../intern/gawain/gawain/imm_util.h"
@@ -54,3 +55,4 @@ void immUniformThemeColorBlendShade(int color_id1, int color_id2, float fac, int
void immUniformThemeColorBlend(int color_id1, int color_id2, float fac); void immUniformThemeColorBlend(int color_id1, int color_id2, float fac);
void immThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset); void immThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset);
#endif /* __GPU_IMMEDIATE_H__ */

6
source/blender/gpu/intern/gpu_shader_private.h
View File

@@ -22,7 +22,8 @@
* \ingroup gpu * \ingroup gpu
*/ */
#pragma once #ifndef __GPU_SHADER_PRIVATE_H__
#define __GPU_SHADER_PRIVATE_H__
#include "GPU_glew.h" #include "GPU_glew.h"
#include "gawain/shader_interface.h" #include "gawain/shader_interface.h"
@@ -39,3 +40,6 @@ struct GPUShader {
ShaderInterface *interface; /* cached uniform & attrib interface for shader */ ShaderInterface *interface; /* cached uniform & attrib interface for shader */
}; };
#endif /* __GPU_SHADER_PRIVATE_H__ */