diff options
-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_context.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_context_private.hh (renamed from source/blender/gpu/intern/gpu_context_private.h) | 23 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_element.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_framebuffer.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_immediate.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_matrix.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_shader_interface.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_texture.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_uniformbuffer.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_vertex_buffer.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_context.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_context.hh | 4 |
14 files changed, 19 insertions, 32 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 6ee992e5726..80ea28aca3c 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -124,7 +124,7 @@ set(SRC intern/gpu_backend.hh intern/gpu_batch_private.h intern/gpu_codegen.h - intern/gpu_context_private.h + intern/gpu_context_private.hh intern/gpu_material_library.h intern/gpu_matrix_private.h intern/gpu_node_graph.h diff --git a/source/blender/gpu/intern/gpu_batch.cc b/source/blender/gpu/intern/gpu_batch.cc index 1dd06076d2a..db3e0930d54 100644 --- a/source/blender/gpu/intern/gpu_batch.cc +++ b/source/blender/gpu/intern/gpu_batch.cc @@ -34,7 +34,7 @@ #include "GPU_shader.h" #include "gpu_batch_private.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include "gpu_primitive_private.h" #include "gpu_shader_private.h" #include "gpu_vertex_format_private.h" diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc index d9f435ce1a9..85a4d643a0c 100644 --- a/source/blender/gpu/intern/gpu_context.cc +++ b/source/blender/gpu/intern/gpu_context.cc @@ -41,7 +41,7 @@ #include "gpu_backend.hh" #include "gpu_batch_private.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include "gpu_matrix_private.h" #ifdef WITH_OPENGL_BACKEND diff --git a/source/blender/gpu/intern/gpu_context_private.h b/source/blender/gpu/intern/gpu_context_private.hh index 37bf110665f..d369dbe7402 100644 --- a/source/blender/gpu/intern/gpu_context_private.h +++ b/source/blender/gpu/intern/gpu_context_private.hh @@ -29,14 +29,11 @@ #include "GPU_context.h" -/* TODO cleanup this ifdef */ -#ifdef __cplusplus - -# include <mutex> -# include <pthread.h> -# include <string.h> -# include <unordered_set> -# include <vector> +#include <mutex> +#include <pthread.h> +#include <string.h> +#include <unordered_set> +#include <vector> struct GPUFrameBuffer; struct GPUMatrixState; @@ -64,12 +61,6 @@ struct GPUContext { MEM_CXX_CLASS_ALLOC_FUNCS("GPUContext") }; -#endif - -#ifdef __cplusplus -extern "C" { -#endif - GLuint GPU_vao_default(void); GLuint GPU_framebuffer_default(void); @@ -96,7 +87,3 @@ void gpu_context_active_framebuffer_set(GPUContext *ctx, struct GPUFrameBuffer * struct GPUFrameBuffer *gpu_context_active_framebuffer_get(GPUContext *ctx); struct GPUMatrixState *gpu_context_active_matrix_state_get(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/gpu/intern/gpu_element.cc b/source/blender/gpu/intern/gpu_element.cc index 449d119267d..cf7cc1d214c 100644 --- a/source/blender/gpu/intern/gpu_element.cc +++ b/source/blender/gpu/intern/gpu_element.cc @@ -28,7 +28,7 @@ #include "GPU_element.h" #include "GPU_glew.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include <stdlib.h> diff --git a/source/blender/gpu/intern/gpu_framebuffer.cc b/source/blender/gpu/intern/gpu_framebuffer.cc index 13df2268221..5f3089b2ffb 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.cc +++ b/source/blender/gpu/intern/gpu_framebuffer.cc @@ -33,7 +33,7 @@ #include "GPU_shader.h" #include "GPU_texture.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include "gpu_private.h" typedef enum { diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc index 7283f7c12aa..9cededa54f7 100644 --- a/source/blender/gpu/intern/gpu_immediate.cc +++ b/source/blender/gpu/intern/gpu_immediate.cc @@ -33,7 +33,7 @@ #include "GPU_texture.h" #include "gpu_attr_binding_private.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include "gpu_primitive_private.h" #include "gpu_shader_private.h" #include "gpu_vertex_format_private.h" diff --git a/source/blender/gpu/intern/gpu_matrix.cc b/source/blender/gpu/intern/gpu_matrix.cc index 4174f498402..5d8d77bbf1c 100644 --- a/source/blender/gpu/intern/gpu_matrix.cc +++ b/source/blender/gpu/intern/gpu_matrix.cc @@ -23,7 +23,7 @@ #include "GPU_shader_interface.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include "gpu_matrix_private.h" #define SUPPRESS_GENERIC_MATRIX_API diff --git a/source/blender/gpu/intern/gpu_shader_interface.cc b/source/blender/gpu/intern/gpu_shader_interface.cc index 7ac4365dd91..50cc68c6be8 100644 --- a/source/blender/gpu/intern/gpu_shader_interface.cc +++ b/source/blender/gpu/intern/gpu_shader_interface.cc @@ -33,7 +33,7 @@ #include "GPU_shader_interface.h" #include "gpu_batch_private.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include <stddef.h> #include <stdlib.h> diff --git a/source/blender/gpu/intern/gpu_texture.cc b/source/blender/gpu/intern/gpu_texture.cc index 5d86f3d16a3..14ef285ad01 100644 --- a/source/blender/gpu/intern/gpu_texture.cc +++ b/source/blender/gpu/intern/gpu_texture.cc @@ -43,7 +43,7 @@ #include "GPU_platform.h" #include "GPU_texture.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #define WARN_NOT_BOUND(_tex) \ { \ diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.cc b/source/blender/gpu/intern/gpu_uniformbuffer.cc index f0724ce7c9a..e203ffd848f 100644 --- a/source/blender/gpu/intern/gpu_uniformbuffer.cc +++ b/source/blender/gpu/intern/gpu_uniformbuffer.cc @@ -27,7 +27,7 @@ #include "BLI_blenlib.h" #include "BLI_math_base.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include "gpu_node_graph.h" #include "GPU_extensions.h" diff --git a/source/blender/gpu/intern/gpu_vertex_buffer.cc b/source/blender/gpu/intern/gpu_vertex_buffer.cc index eda6d1c7300..67ad8835b6a 100644 --- a/source/blender/gpu/intern/gpu_vertex_buffer.cc +++ b/source/blender/gpu/intern/gpu_vertex_buffer.cc @@ -27,7 +27,7 @@ #include "GPU_vertex_buffer.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include "gpu_vertex_format_private.h" #include <stdlib.h> diff --git a/source/blender/gpu/opengl/gl_context.cc b/source/blender/gpu/opengl/gl_context.cc index 696603ab070..029140208f7 100644 --- a/source/blender/gpu/opengl/gl_context.cc +++ b/source/blender/gpu/opengl/gl_context.cc @@ -28,7 +28,7 @@ #include "GHOST_C-api.h" -#include "gpu_context_private.h" +#include "gpu_context_private.hh" #include "gl_backend.hh" /* TODO remove */ #include "gl_context.hh" diff --git a/source/blender/gpu/opengl/gl_context.hh b/source/blender/gpu/opengl/gl_context.hh index 5da288a265f..3b55965b9d1 100644 --- a/source/blender/gpu/opengl/gl_context.hh +++ b/source/blender/gpu/opengl/gl_context.hh @@ -23,10 +23,10 @@ #pragma once -#include "gpu_context_private.h" +#include "gpu_context_private.hh" -#include "BLI_vector.hh" #include "BLI_set.hh" +#include "BLI_vector.hh" #include "glew-mx.h" |