diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-15 17:20:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-15 17:25:47 +0300 |
| commit | b6308d79e59dfe52ce425541cc07ec90a430a635 (patch) | |
| tree | 2997e9f366edc8111f401ff1a61a539a7f1d647c /source | |
| parent | d9e253abce63bc5fbdc38e9aaff40db3124b07c0 (diff) | |
Cleanup: use 'gwn' prefix for gawain filenames
Looking up names project wide or setting breakpoints wasn't so.
Names like common.h or element.h are also too generic.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/gpu/GPU_batch.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_immediate.h | 8 | ||||
| -rw-r--r-- | source/blender/gpu/GPU_matrix.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader_private.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index d052a2d831f..966690c19b2 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -31,7 +31,7 @@ #ifndef __GPU_BATCH_H__ #define __GPU_BATCH_H__ -#include "../../../intern/gawain/gawain/batch.h" +#include "../../../intern/gawain/gawain/gwn_batch.h" // TODO: CMake magic to do this: // #include "gawain/batch.h" diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index 2eb4eb94f48..6206e973908 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -31,12 +31,12 @@ #ifndef __GPU_IMMEDIATE_H__ #define __GPU_IMMEDIATE_H__ -#include "../../../intern/gawain/gawain/immediate.h" -#include "../../../intern/gawain/gawain/imm_util.h" +#include "../../../intern/gawain/gawain/gwn_immediate.h" +#include "../../../intern/gawain/gawain/gwn_imm_util.h" // TODO: CMake magic to do this: -// #include "gawain/immediate.h" -// #include "gawain/imm_util.h" +// #include "gawain/gwn_immediate.h" +// #include "gawain/gwn_imm_util.h" #include "GPU_shader.h" diff --git a/source/blender/gpu/GPU_matrix.h b/source/blender/gpu/GPU_matrix.h index a3fd75b662b..b2e18de3b84 100644 --- a/source/blender/gpu/GPU_matrix.h +++ b/source/blender/gpu/GPU_matrix.h @@ -34,7 +34,7 @@ #include "BLI_sys_types.h" #include "GPU_glew.h" -#include "../../../intern/gawain/gawain/shader_interface.h" +#include "../../../intern/gawain/gawain/gwn_shader_interface.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/gpu/intern/gpu_shader_private.h b/source/blender/gpu/intern/gpu_shader_private.h index 2de05b5746b..f883773df17 100644 --- a/source/blender/gpu/intern/gpu_shader_private.h +++ b/source/blender/gpu/intern/gpu_shader_private.h @@ -26,7 +26,7 @@ #define __GPU_SHADER_PRIVATE_H__ #include "GPU_glew.h" -#include "gawain/shader_interface.h" +#include "gawain/gwn_shader_interface.h" struct GPUShader { GLuint program; /* handle for full program (links shader stages below) */ |