[Bf-blender-cvs] [5336fdc6e36] master: Cleanup: Make shade node util header CPP only
Aaron Carlisle
noreply at git.blender.org
Wed Jan 5 05:25:32 CET 2022
Commit: 5336fdc6e36c13c1b2fe09e21dc2d3bd5be6947b
Author: Aaron Carlisle
Date: Tue Jan 4 23:25:16 2022 -0500
Branches: master
https://developer.blender.org/rB5336fdc6e36c13c1b2fe09e21dc2d3bd5be6947b
Cleanup: Make shade node util header CPP only
Now that all shader nodes are converted to CPP
this header can now be made into a CPP header.
===================================================================
M source/blender/nodes/shader/CMakeLists.txt
M source/blender/nodes/shader/node_shader_tree.cc
M source/blender/nodes/shader/node_shader_util.cc
R088 source/blender/nodes/shader/node_shader_util.h source/blender/nodes/shader/node_shader_util.hh
M source/blender/nodes/shader/nodes/node_shader_add_shader.cc
M source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc
M source/blender/nodes/shader/nodes/node_shader_attribute.cc
M source/blender/nodes/shader/nodes/node_shader_background.cc
M source/blender/nodes/shader/nodes/node_shader_bevel.cc
M source/blender/nodes/shader/nodes/node_shader_blackbody.cc
M source/blender/nodes/shader/nodes/node_shader_brightness.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.cc
M source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.cc
M source/blender/nodes/shader/nodes/node_shader_bump.cc
M source/blender/nodes/shader/nodes/node_shader_camera.cc
M source/blender/nodes/shader/nodes/node_shader_clamp.cc
M source/blender/nodes/shader/nodes/node_shader_color_ramp.cc
M source/blender/nodes/shader/nodes/node_shader_common.cc
M source/blender/nodes/shader/nodes/node_shader_curves.cc
M source/blender/nodes/shader/nodes/node_shader_displacement.cc
M source/blender/nodes/shader/nodes/node_shader_eevee_specular.cc
M source/blender/nodes/shader/nodes/node_shader_emission.cc
M source/blender/nodes/shader/nodes/node_shader_fresnel.cc
M source/blender/nodes/shader/nodes/node_shader_gamma.cc
M source/blender/nodes/shader/nodes/node_shader_geometry.cc
M source/blender/nodes/shader/nodes/node_shader_hair_info.cc
M source/blender/nodes/shader/nodes/node_shader_holdout.cc
M source/blender/nodes/shader/nodes/node_shader_hueSatVal.cc
M source/blender/nodes/shader/nodes/node_shader_ies_light.cc
M source/blender/nodes/shader/nodes/node_shader_invert.cc
M source/blender/nodes/shader/nodes/node_shader_layer_weight.cc
M source/blender/nodes/shader/nodes/node_shader_light_falloff.cc
M source/blender/nodes/shader/nodes/node_shader_light_path.cc
M source/blender/nodes/shader/nodes/node_shader_map_range.cc
M source/blender/nodes/shader/nodes/node_shader_mapping.cc
M source/blender/nodes/shader/nodes/node_shader_math.cc
M source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc
M source/blender/nodes/shader/nodes/node_shader_mix_shader.cc
M source/blender/nodes/shader/nodes/node_shader_normal.cc
M source/blender/nodes/shader/nodes/node_shader_normal_map.cc
M source/blender/nodes/shader/nodes/node_shader_object_info.cc
M source/blender/nodes/shader/nodes/node_shader_output_aov.cc
M source/blender/nodes/shader/nodes/node_shader_output_light.cc
M source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc
M source/blender/nodes/shader/nodes/node_shader_output_material.cc
M source/blender/nodes/shader/nodes/node_shader_output_world.cc
M source/blender/nodes/shader/nodes/node_shader_particle_info.cc
M source/blender/nodes/shader/nodes/node_shader_rgb.cc
M source/blender/nodes/shader/nodes/node_shader_rgb_to_bw.cc
M source/blender/nodes/shader/nodes/node_shader_script.cc
M source/blender/nodes/shader/nodes/node_shader_sepcomb_hsv.cc
M source/blender/nodes/shader/nodes/node_shader_sepcomb_rgb.cc
M source/blender/nodes/shader/nodes/node_shader_sepcomb_xyz.cc
M source/blender/nodes/shader/nodes/node_shader_shader_to_rgb.cc
M source/blender/nodes/shader/nodes/node_shader_squeeze.cc
M source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc
M source/blender/nodes/shader/nodes/node_shader_tangent.cc
M source/blender/nodes/shader/nodes/node_shader_tex_brick.cc
M source/blender/nodes/shader/nodes/node_shader_tex_checker.cc
M source/blender/nodes/shader/nodes/node_shader_tex_coord.cc
M source/blender/nodes/shader/nodes/node_shader_tex_environment.cc
M source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc
M source/blender/nodes/shader/nodes/node_shader_tex_image.cc
M source/blender/nodes/shader/nodes/node_shader_tex_magic.cc
M source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc
M source/blender/nodes/shader/nodes/node_shader_tex_noise.cc
M source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc
M source/blender/nodes/shader/nodes/node_shader_tex_sky.cc
M source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc
M source/blender/nodes/shader/nodes/node_shader_tex_wave.cc
M source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc
M source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc
M source/blender/nodes/shader/nodes/node_shader_uvmap.cc
M source/blender/nodes/shader/nodes/node_shader_value.cc
M source/blender/nodes/shader/nodes/node_shader_vector_displacement.cc
M source/blender/nodes/shader/nodes/node_shader_vector_math.cc
M source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc
M source/blender/nodes/shader/nodes/node_shader_vector_transform.cc
M source/blender/nodes/shader/nodes/node_shader_vertex_color.cc
M source/blender/nodes/shader/nodes/node_shader_volume_absorption.cc
M source/blender/nodes/shader/nodes/node_shader_volume_info.cc
M source/blender/nodes/shader/nodes/node_shader_volume_principled.cc
M source/blender/nodes/shader/nodes/node_shader_volume_scatter.cc
M source/blender/nodes/shader/nodes/node_shader_wavelength.cc
M source/blender/nodes/shader/nodes/node_shader_wireframe.cc
===================================================================
diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt
index 9480fab1f7d..9878ebe3162 100644
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -135,7 +135,7 @@ set(SRC
node_shader_tree.cc
node_shader_util.cc
- node_shader_util.h
+ node_shader_util.hh
)
set(LIB
diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc
index 63bff092513..1552ed9f19c 100644
--- a/source/blender/nodes/shader/node_shader_tree.cc
+++ b/source/blender/nodes/shader/node_shader_tree.cc
@@ -59,7 +59,7 @@
#include "node_common.h"
#include "node_exec.h"
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
#include "node_util.h"
struct nTreeTags {
diff --git a/source/blender/nodes/shader/node_shader_util.cc b/source/blender/nodes/shader/node_shader_util.cc
index ce8c8c1288a..722daa1e4f9 100644
--- a/source/blender/nodes/shader/node_shader_util.cc
+++ b/source/blender/nodes/shader/node_shader_util.cc
@@ -23,7 +23,7 @@
#include "DNA_node_types.h"
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
#include "NOD_socket_search_link.hh"
diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.hh
similarity index 88%
rename from source/blender/nodes/shader/node_shader_util.h
rename to source/blender/nodes/shader/node_shader_util.hh
index 7b1c06f6a56..e66ab9c285b 100644
--- a/source/blender/nodes/shader/node_shader_util.h
+++ b/source/blender/nodes/shader/node_shader_util.hh
@@ -23,29 +23,21 @@
#pragma once
-#include <float.h>
-#include <math.h>
-#include <string.h>
-
-#include "MEM_guardedalloc.h"
-
-#include "DNA_ID.h"
-#include "DNA_color_types.h"
-#include "DNA_customdata_types.h"
-#include "DNA_image_types.h"
-#include "DNA_material_types.h"
-#include "DNA_node_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_texture_types.h"
+#include <cfloat>
+#include <cmath>
+#include <cstring>
#include "BLI_blenlib.h"
+#include "BLI_color.hh"
+#include "BLI_float3.hh"
#include "BLI_math.h"
#include "BLI_math_base_safe.h"
#include "BLI_rand.h"
#include "BLI_threads.h"
#include "BLI_utildefines.h"
+#include "BLT_translation.h"
+
#include "BKE_colorband.h"
#include "BKE_colortools.h"
#include "BKE_global.h"
@@ -55,31 +47,33 @@
#include "BKE_node.h"
#include "BKE_texture.h"
-#include "NOD_shader.h"
-#include "node_util.h"
-
-#include "BLT_translation.h"
-
-#include "IMB_colormanagement.h"
+#include "DNA_ID.h"
+#include "DNA_color_types.h"
+#include "DNA_customdata_types.h"
+#include "DNA_image_types.h"
+#include "DNA_material_types.h"
+#include "DNA_node_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_texture_types.h"
-#include "RE_pipeline.h"
-#include "RE_texture.h"
+#include "FN_multi_function_builder.hh"
#include "GPU_material.h"
#include "GPU_texture.h"
#include "GPU_uniform_buffer.h"
-#ifdef __cplusplus
-# include "FN_multi_function_builder.hh"
+#include "IMB_colormanagement.h"
-# include "NOD_multi_function.hh"
-# include "NOD_socket_declarations.hh"
+#include "MEM_guardedalloc.h"
-# include "BLI_color.hh"
-# include "BLI_float3.hh"
+#include "NOD_multi_function.hh"
+#include "NOD_shader.h"
+#include "NOD_socket_declarations.hh"
+#include "node_util.h"
-extern "C" {
-#endif
+#include "RE_pipeline.h"
+#include "RE_texture.h"
bool sh_node_poll_default(struct bNodeType *ntype,
struct bNodeTree *ntree,
@@ -89,15 +83,15 @@ void sh_fn_node_type_base(struct bNodeType *ntype, int type, const char *name, s
/* ********* exec data struct, remains internal *********** */
-typedef struct ShaderCallData {
+struct ShaderCallData {
/* Empty for now, may be reused if we convert shader to texture nodes. */
int dummy;
-} ShaderCallData;
+};
-typedef struct XYZ_to_RGB /* Transposed #imbuf_xyz_to_rgb, passed as 3x vec3. */
+struct XYZ_to_RGB /* Transposed #imbuf_xyz_to_rgb, passed as 3x vec3. */
{
float r[3], g[3], b[3];
-} XYZ_to_RGB;
+};
void nodestack_get_vec(float *in, short type_in, bNodeStack *ns);
@@ -118,7 +112,3 @@ void ntreeExecGPUNodes(struct bNodeTreeExec *exec,
struct GPUMaterial *mat,
struct bNode *output_node);
void get_XYZ_to_RGB_for_gpu(XYZ_to_RGB *data);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/nodes/shader/nodes/node_shader_add_shader.cc b/source/blender/nodes/shader/nodes/node_shader_add_shader.cc
index b9822014590..b6346995725 100644
--- a/source/blender/nodes/shader/nodes/node_shader_add_shader.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_add_shader.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_add_shader_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc
index 1bcf1308084..2fb0ea628e3 100644
--- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_ambient_occlusion_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_attribute.cc b/source/blender/nodes/shader/nodes/node_shader_attribute.cc
index 6bca7cab618..780d0a72ef8 100644
--- a/source/blender/nodes/shader/nodes/node_shader_attribute.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_attribute.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_attribute_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_background.cc b/source/blender/nodes/shader/nodes/node_shader_background.cc
index 2650d6b6033..39858e36fd1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_background.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_background.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_background_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_bevel.cc b/source/blender/nodes/shader/nodes/node_shader_bevel.cc
index 2016ac5411d..a3063358556 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bevel.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bevel.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_bevel_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_blackbody.cc b/source/blender/nodes/shader/nodes/node_shader_blackbody.cc
index f5e9b38efa9..1e71201f295 100644
--- a/source/blender/nodes/shader/nodes/node_shader_blackbody.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_blackbody.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_blackbody_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_brightness.cc b/source/blender/nodes/shader/nodes/node_shader_brightness.cc
index b66a40fe869..e6328c4972a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_brightness.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_brightness.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_brightness_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc
index e8e35fec148..2e698aeb4d7 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_bsdf_anisotropic_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc
index 7513b8daf2b..3719227f46c 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_bsdf_diffuse_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc
index a0abd5b60db..2cea42146fd 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_bsdf_glass_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc
index 4fd6f61e7b1..1227d79af93 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_bsdf_glossy_cc {
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc
index ef0b085411f..56282d1c991 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc
@@ -17,7 +17,7 @@
* All rights reserved.
*/
-#include "node_shader_util.h"
+#include "node_shader_util.hh"
namespace blender::nodes::node_shader_bsdf_h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list