From f1b1a0745f53564ed8eedd90d2de41cdf1d72836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Sat, 8 Aug 2020 03:01:45 +0200 Subject: Cleanup: GPU: Change gpu_context_private.h to C++ only header --- source/blender/gpu/intern/gpu_batch.cc | 2 +- source/blender/gpu/intern/gpu_context.cc | 2 +- source/blender/gpu/intern/gpu_context_private.h | 102 ---------------------- source/blender/gpu/intern/gpu_context_private.hh | 89 +++++++++++++++++++ source/blender/gpu/intern/gpu_element.cc | 2 +- source/blender/gpu/intern/gpu_framebuffer.cc | 2 +- source/blender/gpu/intern/gpu_immediate.cc | 2 +- source/blender/gpu/intern/gpu_matrix.cc | 2 +- source/blender/gpu/intern/gpu_shader_interface.cc | 2 +- source/blender/gpu/intern/gpu_texture.cc | 2 +- source/blender/gpu/intern/gpu_uniformbuffer.cc | 2 +- source/blender/gpu/intern/gpu_vertex_buffer.cc | 2 +- 12 files changed, 99 insertions(+), 112 deletions(-) delete mode 100644 source/blender/gpu/intern/gpu_context_private.h create mode 100644 source/blender/gpu/intern/gpu_context_private.hh (limited to 'source/blender/gpu/intern') 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.h deleted file mode 100644 index 37bf110665f..00000000000 --- a/source/blender/gpu/intern/gpu_context_private.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * The Original Code is Copyright (C) 2016 by Mike Erwin. - * All rights reserved. - */ - -/** \file - * \ingroup gpu - * - * This interface allow GPU to manage GL objects for multiple context and threads. - */ - -#pragma once - -#include "MEM_guardedalloc.h" - -#include "GPU_context.h" - -/* TODO cleanup this ifdef */ -#ifdef __cplusplus - -# include -# include -# include -# include -# include - -struct GPUFrameBuffer; -struct GPUMatrixState; - -struct GPUContext { - public: - /** State managment */ - GPUFrameBuffer *current_fbo = NULL; - GPUMatrixState *matrix_state = NULL; - - protected: - /** Thread on which this context is active. */ - pthread_t thread_; - bool is_active_; - - public: - GPUContext(); - virtual ~GPUContext(); - - virtual void activate(void) = 0; - virtual void deactivate(void) = 0; - - bool is_active_on_thread(void); - - MEM_CXX_CLASS_ALLOC_FUNCS("GPUContext") -}; - -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -GLuint GPU_vao_default(void); -GLuint GPU_framebuffer_default(void); - -/* These require a gl ctx bound. */ -GLuint GPU_buf_alloc(void); -GLuint GPU_tex_alloc(void); -GLuint GPU_vao_alloc(void); -GLuint GPU_fbo_alloc(void); - -/* These can be called any threads even without gl ctx. */ -void GPU_buf_free(GLuint buf_id); -void GPU_tex_free(GLuint tex_id); -/* These two need the ctx the id was created with. */ -void GPU_vao_free(GLuint vao_id, GPUContext *ctx); -void GPU_fbo_free(GLuint fbo_id, GPUContext *ctx); - -void gpu_context_add_batch(GPUContext *ctx, GPUBatch *batch); -void gpu_context_remove_batch(GPUContext *ctx, GPUBatch *batch); - -void gpu_context_add_framebuffer(GPUContext *ctx, struct GPUFrameBuffer *fb); -void gpu_context_remove_framebuffer(GPUContext *ctx, struct GPUFrameBuffer *fb); - -void gpu_context_active_framebuffer_set(GPUContext *ctx, struct GPUFrameBuffer *fb); -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_context_private.hh b/source/blender/gpu/intern/gpu_context_private.hh new file mode 100644 index 00000000000..d369dbe7402 --- /dev/null +++ b/source/blender/gpu/intern/gpu_context_private.hh @@ -0,0 +1,89 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2016 by Mike Erwin. + * All rights reserved. + */ + +/** \file + * \ingroup gpu + * + * This interface allow GPU to manage GL objects for multiple context and threads. + */ + +#pragma once + +#include "MEM_guardedalloc.h" + +#include "GPU_context.h" + +#include +#include +#include +#include +#include + +struct GPUFrameBuffer; +struct GPUMatrixState; + +struct GPUContext { + public: + /** State managment */ + GPUFrameBuffer *current_fbo = NULL; + GPUMatrixState *matrix_state = NULL; + + protected: + /** Thread on which this context is active. */ + pthread_t thread_; + bool is_active_; + + public: + GPUContext(); + virtual ~GPUContext(); + + virtual void activate(void) = 0; + virtual void deactivate(void) = 0; + + bool is_active_on_thread(void); + + MEM_CXX_CLASS_ALLOC_FUNCS("GPUContext") +}; + +GLuint GPU_vao_default(void); +GLuint GPU_framebuffer_default(void); + +/* These require a gl ctx bound. */ +GLuint GPU_buf_alloc(void); +GLuint GPU_tex_alloc(void); +GLuint GPU_vao_alloc(void); +GLuint GPU_fbo_alloc(void); + +/* These can be called any threads even without gl ctx. */ +void GPU_buf_free(GLuint buf_id); +void GPU_tex_free(GLuint tex_id); +/* These two need the ctx the id was created with. */ +void GPU_vao_free(GLuint vao_id, GPUContext *ctx); +void GPU_fbo_free(GLuint fbo_id, GPUContext *ctx); + +void gpu_context_add_batch(GPUContext *ctx, GPUBatch *batch); +void gpu_context_remove_batch(GPUContext *ctx, GPUBatch *batch); + +void gpu_context_add_framebuffer(GPUContext *ctx, struct GPUFrameBuffer *fb); +void gpu_context_remove_framebuffer(GPUContext *ctx, struct GPUFrameBuffer *fb); + +void gpu_context_active_framebuffer_set(GPUContext *ctx, struct GPUFrameBuffer *fb); +struct GPUFrameBuffer *gpu_context_active_framebuffer_get(GPUContext *ctx); + +struct GPUMatrixState *gpu_context_active_matrix_state_get(void); 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 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 #include 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 -- cgit v1.2.3