Cleanup: GPUBatch: Move gpu_batch_private.h to CPP header

2020-08-09 01:21:34 +02:00
parent 16b28ff974
commit b0f30bd684
5 changed files with 4 additions and 12 deletions
--- 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
--- 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"
--- a/source/blender/gpu/intern/gpu_batch_private.hh
+++ 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
--- 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"

--- 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>