[Bf-blender-cvs] [7283e6fb734] master: Merge branch 'blender-v2.90-release' into master
Jacques Lucke
noreply at git.blender.org
Fri Aug 7 10:05:09 CEST 2020
Commit: 7283e6fb73490ddd23425ba2cf06cda7ac8f9458
Author: Jacques Lucke
Date: Fri Aug 7 10:04:57 2020 +0200
Branches: master
https://developer.blender.org/rB7283e6fb73490ddd23425ba2cf06cda7ac8f9458
Merge branch 'blender-v2.90-release' into master
===================================================================
===================================================================
diff --cc source/blender/editors/include/BIF_glutil.h
index cfd92bf3113,e0ce72e5c3c..3b7eb01f92c
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@@ -21,11 -21,8 +21,10 @@@
* \ingroup editorui
*/
- #ifndef __BIF_GLUTIL_H__
- #define __BIF_GLUTIL_H__
+ #pragma once
+#include "GPU_texture.h"
+
#ifdef __cplusplus
extern "C" {
#endif
diff --cc source/blender/gpu/GPU_debug.h
index fc6ca791664,282c2437640..be822056678
--- a/source/blender/gpu/GPU_debug.h
+++ b/source/blender/gpu/GPU_debug.h
@@@ -21,9 -21,10 +21,8 @@@
* \ingroup gpu
*/
- #ifndef __GPU_DEBUG_H__
- #define __GPU_DEBUG_H__
+ #pragma once
-#include "GPU_glew.h"
-
#ifdef __cplusplus
extern "C" {
#endif
diff --cc source/blender/gpu/GPU_platform.h
index 104d5ef0ddc,0848252c788..a89298c0d01
--- a/source/blender/gpu/GPU_platform.h
+++ b/source/blender/gpu/GPU_platform.h
@@@ -21,11 -21,13 +21,10 @@@
* \ingroup gpu
*/
- #ifndef __GPU_PLATFORM_H__
- #define __GPU_PLATFORM_H__
+ #pragma once
#include "BLI_sys_types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "BLI_utildefines.h"
/* GPU platform support */
diff --cc source/blender/gpu/GPU_texture.h
index 1fbcfd41dec,7cbd4b1eee3..7ee7f8fcdec
--- a/source/blender/gpu/GPU_texture.h
+++ b/source/blender/gpu/GPU_texture.h
@@@ -21,11 -21,9 +21,10 @@@
* \ingroup gpu
*/
- #ifndef __GPU_TEXTURE_H__
- #define __GPU_TEXTURE_H__
+ #pragma once
#include "BLI_utildefines.h"
+
#include "GPU_state.h"
struct GPUVertBuf;
diff --cc source/blender/gpu/intern/gpu_attr_binding_private.h
index 7df403a3ea5,4f18655ec62..4d359343c38
--- a/source/blender/gpu/intern/gpu_attr_binding_private.h
+++ b/source/blender/gpu/intern/gpu_attr_binding_private.h
@@@ -40,9 -34,3 +39,7 @@@ void get_attr_locations(const GPUVertFo
GPUAttrBinding *binding,
const GPUShaderInterface *shaderface);
uint read_attr_location(const GPUAttrBinding *binding, uint a_idx);
+
+#ifdef __cplusplus
+}
+#endif
-
- #endif /* __GPU_ATTR_BINDING_PRIVATE_H__ */
diff --cc source/blender/gpu/intern/gpu_codegen.h
index c08ac663cef,1454edeb1e0..5d130d75d2c
--- a/source/blender/gpu/intern/gpu_codegen.h
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@@ -23,13 -23,8 +23,12 @@@
* Generate shader code from the intermediate node graph.
*/
- #ifndef __GPU_CODEGEN_H__
- #define __GPU_CODEGEN_H__
+ #pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct GPUMaterial;
struct GPUNodeGraph;
struct GPUOutput;
@@@ -66,9 -61,3 +65,7 @@@ void GPU_pass_release(GPUPass *pass)
void gpu_codegen_init(void);
void gpu_codegen_exit(void);
+
+#ifdef __cplusplus
+}
+#endif
-
- #endif /* __GPU_CODEGEN_H__ */
diff --cc source/blender/gpu/intern/gpu_primitive_private.h
index b7d7b262128,b3b6bd7fc88..e91eec18786
--- a/source/blender/gpu/intern/gpu_primitive_private.h
+++ b/source/blender/gpu/intern/gpu_primitive_private.h
@@@ -23,18 -23,6 +23,15 @@@
* GPU geometric primitives
*/
- #ifndef __GPU_PRIMITIVE_PRIVATE_H__
- #define __GPU_PRIMITIVE_PRIVATE_H__
+ #pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* TODO(fclem) move to OGL backend */
GLenum convert_prim_type_to_gl(GPUPrimType);
+
+#ifdef __cplusplus
+}
+#endif
-
- #endif /* __GPU_PRIMITIVE_PRIVATE_H__ */
diff --cc source/blender/gpu/intern/gpu_private.h
index ed729dd399c,a5caa816ef4..ef96bedae4a
--- a/source/blender/gpu/intern/gpu_private.h
+++ b/source/blender/gpu/intern/gpu_private.h
@@@ -18,13 -18,8 +18,12 @@@
* \ingroup gpu
*/
- #ifndef __GPU_PRIVATE_H__
- #define __GPU_PRIVATE_H__
+ #pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* call this before running any of the functions below */
void gpu_platform_init(void);
void gpu_platform_exit(void);
@@@ -44,9 -39,3 +43,7 @@@ void gpu_framebuffer_module_exit(void)
/* gpu_pbvh.c */
void gpu_pbvh_init(void);
void gpu_pbvh_exit(void);
+
+#ifdef __cplusplus
+}
+#endif
-
- #endif /* __GPU_PRIVATE_H__ */
diff --cc source/blender/gpu/intern/gpu_shader_private.h
index 2c52568ac25,e04d8655421..0f89fbda737
--- a/source/blender/gpu/intern/gpu_shader_private.h
+++ b/source/blender/gpu/intern/gpu_shader_private.h
@@@ -18,15 -18,11 +18,14 @@@
* \ingroup gpu
*/
- #ifndef __GPU_SHADER_PRIVATE_H__
- #define __GPU_SHADER_PRIVATE_H__
+ #pragma once
-#include "GPU_glew.h"
#include "GPU_shader_interface.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct GPUShader {
/** Handle for full program (links shader stages below). */
GLuint program;
@@@ -48,10 -44,4 +47,8 @@@
};
/* XXX do not use it. Special hack to use OCIO with batch API. */
-void immGetProgram(GLuint *program, GPUShaderInterface **shaderface);
+GPUShader *immGetShader(void);
+
+#ifdef __cplusplus
+}
+#endif
-
- #endif /* __GPU_SHADER_PRIVATE_H__ */
diff --cc source/blender/gpu/intern/gpu_vertex_format_private.h
index 7b560a35bd0,a80c085b44a..45523c0e956
--- a/source/blender/gpu/intern/gpu_vertex_format_private.h
+++ b/source/blender/gpu/intern/gpu_vertex_format_private.h
@@@ -23,20 -23,8 +23,17 @@@
* GPU vertex format
*/
- #ifndef __GPU_VERTEX_FORMAT_PRIVATE_H__
- #define __GPU_VERTEX_FORMAT_PRIVATE_H__
+ #pragma once
+#ifdef __cplusplus
+extern "C" {
+#endif
+
void VertexFormat_pack(GPUVertFormat *format);
uint padding(uint offset, uint alignment);
uint vertex_buffer_size(const GPUVertFormat *format, uint vertex_len);
+GLenum convert_comp_type_to_gl(GPUVertCompType type);
+
+#ifdef __cplusplus
+}
+#endif
-
- #endif /* __GPU_VERTEX_FORMAT_PRIVATE_H__ */
diff --cc source/blender/makesdna/DNA_simulation_types.h
index afc59b422c5,de4c9522334..8cc2db99332
--- a/source/blender/makesdna/DNA_simulation_types.h
+++ b/source/blender/makesdna/DNA_simulation_types.h
@@@ -86,13 -79,5 +85,11 @@@ enum
SIM_DS_EXPAND = (1 << 0),
};
+/* SimulationDependency.flag */
+enum {
+ SIM_DEPENDS_ON_TRANSFORM = (1 << 0),
+ SIM_DEPENDS_ON_GEOMETRY = (1 << 1),
+};
+
#define SIM_TYPE_NAME_PARTICLE_SIMULATION "Particle Simulation"
#define SIM_TYPE_NAME_PARTICLE_MESH_EMITTER "Particle Mesh Emitter"
-
- #endif /* __DNA_SIMULATION_TYPES_H__ */
diff --cc source/blender/simulation/SIM_simulation_update.hh
index efdfde8a4de,2c64fdec02e..7c2726f038e
--- a/source/blender/simulation/SIM_simulation_update.hh
+++ b/source/blender/simulation/SIM_simulation_update.hh
@@@ -27,8 -26,4 +26,6 @@@ void update_simulation_in_depsgraph(Dep
Scene *scene_cow,
Simulation *simulation_cow);
-}
+bool update_simulation_dependencies(Simulation *simulation);
+
+} // namespace blender::sim
-
- #endif /* __SIM_SIMULATION_UPDATE_HH__ */
diff --cc source/blender/simulation/intern/simulation_solver.hh
index 9d30ea87731,3fc61f579e3..2cf8eb2aa27
--- a/source/blender/simulation/intern/simulation_solver.hh
+++ b/source/blender/simulation/intern/simulation_solver.hh
@@@ -14,10 -14,20 +14,9 @@@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
- #ifndef __SIM_SIMULATION_SOLVER_HH__
- #define __SIM_SIMULATION_SOLVER_HH__
+ #pragma once
-#include "BLI_float3.hh"
-#include "BLI_span.hh"
-
-#include "DNA_simulation_types.h"
-
-#include "FN_attributes_ref.hh"
-
-#include "BKE_persistent_data_handle.hh"
-#include "BKE_simulation.h"
-
-#include "particle_allocator.hh"
-#include "time_interval.hh"
+#include "simulation_collect_influences.hh"
struct Depsgraph;
diff --cc source/blender/windowmanager/wm_draw.h
index 9b6bd66c0e5,a26c02317d0..4997361b485
--- a/source/blender/windowmanager/wm_draw.h
+++ b/source/blender/windowmanager/wm_draw.h
@@@ -21,9 -21,10 +21,8 @@@
* \ingroup wm
*/
- #ifndef __WM_DRAW_H__
- #define __WM_DRAW_H__
+ #pragma once
-#include "GPU_glew.h"
-
struct GPUOffScreen;
struct GPUTexture;
struct GPUViewport;
More information about the Bf-blender-cvs
mailing list