diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-09 02:21:34 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-13 15:20:23 +0300 |
| commit | b0f30bd684645cb989b6744b04f70bccec7d360b (patch) | |
| tree | d56e6c4cbe4c975eaa4f8c206b19205a80d2d633 /source/blender/gpu | |
| parent | 16b28ff974b640283aa2e4bcdb554a84f2994ff1 (diff) | |
Cleanup: GPUBatch: Move gpu_batch_private.h to CPP header
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_batch.cc | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_batch_private.hh (renamed from source/blender/gpu/intern/gpu_batch_private.h) | 8 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_context.cc | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader_interface.cc | 2 |
5 files changed, 4 insertions, 12 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index fe5c5d4fa7b..0d92d125402 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -125,7 +125,7 @@ set(SRC intern/gpu_attr_binding_private.h intern/gpu_backend.hh - intern/gpu_batch_private.h + intern/gpu_batch_private.hh intern/gpu_codegen.h intern/gpu_context_private.hh intern/gpu_drawlist_private.hh diff --git a/source/blender/gpu/intern/gpu_batch.cc b/source/blender/gpu/intern/gpu_batch.cc index e71ebec1a3b..ad0472cd932 100644 --- a/source/blender/gpu/intern/gpu_batch.cc +++ b/source/blender/gpu/intern/gpu_batch.cc @@ -33,7 +33,7 @@ #include "GPU_platform.h" #include "GPU_shader.h" -#include "gpu_batch_private.h" +#include "gpu_batch_private.hh" #include "gpu_context_private.hh" #include "gpu_primitive_private.h" #include "gpu_shader_private.h" diff --git a/source/blender/gpu/intern/gpu_batch_private.h b/source/blender/gpu/intern/gpu_batch_private.hh index 93745b9ca9b..a5a863310a1 100644 --- a/source/blender/gpu/intern/gpu_batch_private.h +++ b/source/blender/gpu/intern/gpu_batch_private.hh @@ -30,12 +30,4 @@ #include "GPU_context.h" #include "GPU_shader_interface.h" -#ifdef __cplusplus -extern "C" { -#endif - void gpu_batch_remove_interface_ref(GPUBatch *batch, const GPUShaderInterface *interface); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc index da0d3cd395f..66514deefbc 100644 --- a/source/blender/gpu/intern/gpu_context.cc +++ b/source/blender/gpu/intern/gpu_context.cc @@ -40,7 +40,7 @@ #include "GHOST_C-api.h" #include "gpu_backend.hh" -#include "gpu_batch_private.h" +#include "gpu_batch_private.hh" #include "gpu_context_private.hh" #include "gpu_matrix_private.h" diff --git a/source/blender/gpu/intern/gpu_shader_interface.cc b/source/blender/gpu/intern/gpu_shader_interface.cc index 4511d4a199d..d825dde7e10 100644 --- a/source/blender/gpu/intern/gpu_shader_interface.cc +++ b/source/blender/gpu/intern/gpu_shader_interface.cc @@ -32,7 +32,7 @@ #include "GPU_shader_interface.h" -#include "gpu_batch_private.h" +#include "gpu_batch_private.hh" #include "gpu_context_private.hh" #include <stddef.h> |