Cycles API: encapsulate Node socket members

This encapsulates Node socket members behind a set of specific methods;
as such it is no longer possible to directly access Node class members
from exporters and parts of Cycles.

The methods are defined via the NODE_SOCKET_API macros in `graph/
node.h`, and are for getting or setting a specific socket's value, as
well as querying or modifying the state of its update flag.

The setters will check whether the value has changed and tag the socket
as modified appropriately. This will let us know how a Node has changed
and what to update, which is the first concrete step toward a more
granular scene update system.

Since the setters will tag the Node sockets as modified when passed
different data, this patch also removes the various `modified` methods
on Nodes in favor of `Node::is_modified` which checks the sockets'
update flags status.

Reviewed By: brecht

Maniphest Tasks: T79174

Differential Revision: https://developer.blender.org/D8544

1 files changed, 380 insertions, 281 deletions

diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 62dd9d843a8..4d51b4fccaf 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -70,6 +70,17 @@ class TextureNode : public ShaderNode {
   {
   }
   TextureMapping tex_mapping;
+  NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, translation)
+  NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, rotation)
+  NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, scale)
+  NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, min)
+  NODE_SOCKET_API_STRUCT_MEMBER(float3, tex_mapping, max)
+  NODE_SOCKET_API_STRUCT_MEMBER(bool, tex_mapping, use_minmax)
+  NODE_SOCKET_API_STRUCT_MEMBER(TextureMapping::Type, tex_mapping, type)
+  NODE_SOCKET_API_STRUCT_MEMBER(TextureMapping::Mapping, tex_mapping, x_mapping)
+  NODE_SOCKET_API_STRUCT_MEMBER(TextureMapping::Mapping, tex_mapping, y_mapping)
+  NODE_SOCKET_API_STRUCT_MEMBER(TextureMapping::Mapping, tex_mapping, z_mapping)
+  NODE_SOCKET_API_STRUCT_MEMBER(TextureMapping::Projection, tex_mapping, projection)
 };
 
 /* Any node which uses image manager's slot should be a subclass of this one. */
@@ -108,16 +119,16 @@ class ImageTextureNode : public ImageSlotTextureNode {
   ImageParams image_params() const;
 
   /* Parameters. */
-  ustring filename;
-  ustring colorspace;
-  ImageAlphaType alpha_type;
-  NodeImageProjection projection;
-  InterpolationType interpolation;
-  ExtensionType extension;
-  float projection_blend;
-  bool animated;
-  float3 vector;
-  ccl::vector<int> tiles;
+  NODE_SOCKET_API(ustring, filename)
+  NODE_SOCKET_API(ustring, colorspace)
+  NODE_SOCKET_API(ImageAlphaType, alpha_type)
+  NODE_SOCKET_API(NodeImageProjection, projection)
+  NODE_SOCKET_API(InterpolationType, interpolation)
+  NODE_SOCKET_API(ExtensionType, extension)
+  NODE_SOCKET_API(float, projection_blend)
+  NODE_SOCKET_API(bool, animated)
+  NODE_SOCKET_API(float3, vector)
+  NODE_SOCKET_API(array<int>, tiles)
 
  protected:
   void cull_tiles(Scene *scene, ShaderGraph *graph);
@@ -146,13 +157,13 @@ class EnvironmentTextureNode : public ImageSlotTextureNode {
   ImageParams image_params() const;
 
   /* Parameters. */
-  ustring filename;
-  ustring colorspace;
-  ImageAlphaType alpha_type;
-  NodeEnvironmentProjection projection;
-  InterpolationType interpolation;
-  bool animated;
-  float3 vector;
+  NODE_SOCKET_API(ustring, filename)
+  NODE_SOCKET_API(ustring, colorspace)
+  NODE_SOCKET_API(ImageAlphaType, alpha_type)
+  NODE_SOCKET_API(NodeEnvironmentProjection, projection)
+  NODE_SOCKET_API(InterpolationType, interpolation)
+  NODE_SOCKET_API(bool, animated)
+  NODE_SOCKET_API(float3, vector)
 };
 
 class SkyTextureNode : public TextureNode {
@@ -164,20 +175,20 @@ class SkyTextureNode : public TextureNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  NodeSkyType type;
-  float3 sun_direction;
-  float turbidity;
-  float ground_albedo;
-  bool sun_disc;
-  float sun_size;
-  float sun_intensity;
-  float sun_elevation;
-  float sun_rotation;
-  float altitude;
-  float air_density;
-  float dust_density;
-  float ozone_density;
-  float3 vector;
+  NODE_SOCKET_API(NodeSkyType, sky_type)
+  NODE_SOCKET_API(float3, sun_direction)
+  NODE_SOCKET_API(float, turbidity)
+  NODE_SOCKET_API(float, ground_albedo)
+  NODE_SOCKET_API(bool, sun_disc)
+  NODE_SOCKET_API(float, sun_size)
+  NODE_SOCKET_API(float, sun_intensity)
+  NODE_SOCKET_API(float, sun_elevation)
+  NODE_SOCKET_API(float, sun_rotation)
+  NODE_SOCKET_API(float, altitude)
+  NODE_SOCKET_API(float, air_density)
+  NODE_SOCKET_API(float, dust_density)
+  NODE_SOCKET_API(float, ozone_density)
+  NODE_SOCKET_API(float3, vector)
   ImageHandle handle;
 
   float get_sun_size()
@@ -191,10 +202,10 @@ class OutputNode : public ShaderNode {
  public:
   SHADER_NODE_CLASS(OutputNode)
 
-  void *surface;
-  void *volume;
-  float3 displacement;
-  float3 normal;
+  NODE_SOCKET_API(Node *, surface)
+  NODE_SOCKET_API(Node *, volume)
+  NODE_SOCKET_API(float3, displacement)
+  NODE_SOCKET_API(float3, normal)
 
   /* Don't allow output node de-duplication. */
   virtual bool equals(const ShaderNode & /*other*/)
@@ -208,10 +219,10 @@ class OutputAOVNode : public ShaderNode {
   SHADER_NODE_CLASS(OutputAOVNode)
   virtual void simplify_settings(Scene *scene);
 
-  float value;
-  float3 color;
+  NODE_SOCKET_API(float, value)
+  NODE_SOCKET_API(float3, color)
 
-  ustring name;
+  NODE_SOCKET_API(ustring, name)
 
   virtual int get_group()
   {
@@ -237,17 +248,21 @@ class GradientTextureNode : public TextureNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  NodeGradientType type;
-  float3 vector;
+  NODE_SOCKET_API(NodeGradientType, gradient_type)
+  NODE_SOCKET_API(float3, vector)
 };
 
 class NoiseTextureNode : public TextureNode {
  public:
   SHADER_NODE_CLASS(NoiseTextureNode)
 
-  int dimensions;
-  float w, scale, detail, roughness, distortion;
-  float3 vector;
+  NODE_SOCKET_API(int, dimensions)
+  NODE_SOCKET_API(float, w)
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(float, detail)
+  NODE_SOCKET_API(float, roughness)
+  NODE_SOCKET_API(float, distortion)
+  NODE_SOCKET_API(float3, vector)
 };
 
 class VoronoiTextureNode : public TextureNode {
@@ -271,11 +286,15 @@ class VoronoiTextureNode : public TextureNode {
     return result;
   }
 
-  int dimensions;
-  NodeVoronoiDistanceMetric metric;
-  NodeVoronoiFeature feature;
-  float w, scale, exponent, smoothness, randomness;
-  float3 vector;
+  NODE_SOCKET_API(int, dimensions)
+  NODE_SOCKET_API(NodeVoronoiDistanceMetric, metric)
+  NODE_SOCKET_API(NodeVoronoiFeature, feature)
+  NODE_SOCKET_API(float, w)
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(float, exponent)
+  NODE_SOCKET_API(float, smoothness)
+  NODE_SOCKET_API(float, randomness)
+  NODE_SOCKET_API(float3, vector)
 };
 
 class MusgraveTextureNode : public TextureNode {
@@ -287,10 +306,16 @@ class MusgraveTextureNode : public TextureNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  int dimensions;
-  NodeMusgraveType type;
-  float w, scale, detail, dimension, lacunarity, offset, gain;
-  float3 vector;
+  NODE_SOCKET_API(int, dimensions)
+  NODE_SOCKET_API(NodeMusgraveType, musgrave_type)
+  NODE_SOCKET_API(float, w)
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(float, detail)
+  NODE_SOCKET_API(float, dimension)
+  NODE_SOCKET_API(float, lacunarity)
+  NODE_SOCKET_API(float, offset)
+  NODE_SOCKET_API(float, gain)
+  NODE_SOCKET_API(float3, vector)
 };
 
 class WaveTextureNode : public TextureNode {
@@ -302,13 +327,18 @@ class WaveTextureNode : public TextureNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  NodeWaveType type;
-  NodeWaveBandsDirection bands_direction;
-  NodeWaveRingsDirection rings_direction;
-  NodeWaveProfile profile;
+  NODE_SOCKET_API(NodeWaveType, wave_type)
+  NODE_SOCKET_API(NodeWaveBandsDirection, bands_direction)
+  NODE_SOCKET_API(NodeWaveRingsDirection, rings_direction)
+  NODE_SOCKET_API(NodeWaveProfile, profile)
 
-  float scale, distortion, detail, detail_scale, detail_roughness, phase;
-  float3 vector;
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(float, distortion)
+  NODE_SOCKET_API(float, detail)
+  NODE_SOCKET_API(float, detail_scale)
+  NODE_SOCKET_API(float, detail_roughness)
+  NODE_SOCKET_API(float, phase)
+  NODE_SOCKET_API(float3, vector)
 };
 
 class MagicTextureNode : public TextureNode {
@@ -320,17 +350,20 @@ class MagicTextureNode : public TextureNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  int depth;
-  float3 vector;
-  float scale, distortion;
+  NODE_SOCKET_API(int, depth)
+  NODE_SOCKET_API(float3, vector)
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(float, distortion)
 };
 
 class CheckerTextureNode : public TextureNode {
  public:
   SHADER_NODE_CLASS(CheckerTextureNode)
 
-  float3 vector, color1, color2;
-  float scale;
+  NODE_SOCKET_API(float3, vector)
+  NODE_SOCKET_API(float3, color1)
+  NODE_SOCKET_API(float3, color2)
+  NODE_SOCKET_API(float, scale)
 
   virtual int get_group()
   {
@@ -342,12 +375,21 @@ class BrickTextureNode : public TextureNode {
  public:
   SHADER_NODE_CLASS(BrickTextureNode)
 
-  float offset, squash;
-  int offset_frequency, squash_frequency;
-
-  float3 color1, color2, mortar;
-  float scale, mortar_size, mortar_smooth, bias, brick_width, row_height;
-  float3 vector;
+  NODE_SOCKET_API(float, offset)
+  NODE_SOCKET_API(float, squash)
+  NODE_SOCKET_API(int, offset_frequency)
+  NODE_SOCKET_API(int, squash_frequency)
+
+  NODE_SOCKET_API(float3, color1)
+  NODE_SOCKET_API(float3, color2)
+  NODE_SOCKET_API(float3, mortar)
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(float, mortar_size)
+  NODE_SOCKET_API(float, mortar_smooth)
+  NODE_SOCKET_API(float, bias)
+  NODE_SOCKET_API(float, brick_width)
+  NODE_SOCKET_API(float, row_height)
+  NODE_SOCKET_API(float3, vector)
 
   virtual int get_group()
   {
@@ -377,11 +419,11 @@ class PointDensityTextureNode : public ShaderNode {
   }
 
   /* Parameters. */
-  ustring filename;
-  NodeTexVoxelSpace space;
-  InterpolationType interpolation;
-  Transform tfm;
-  float3 vector;
+  NODE_SOCKET_API(ustring, filename)
+  NODE_SOCKET_API(NodeTexVoxelSpace, space)
+  NODE_SOCKET_API(InterpolationType, interpolation)
+  NODE_SOCKET_API(Transform, tfm)
+  NODE_SOCKET_API(float3, vector)
 
   /* Runtime. */
   ImageHandle handle;
@@ -406,11 +448,11 @@ class IESLightNode : public TextureNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  ustring filename;
-  ustring ies;
+  NODE_SOCKET_API(ustring, filename)
+  NODE_SOCKET_API(ustring, ies)
 
-  float strength;
-  float3 vector;
+  NODE_SOCKET_API(float, strength)
+  NODE_SOCKET_API(float3, vector)
 
  private:
   LightManager *light_manager;
@@ -427,9 +469,9 @@ class WhiteNoiseTextureNode : public ShaderNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  int dimensions;
-  float3 vector;
-  float w;
+  NODE_SOCKET_API(int, dimensions)
+  NODE_SOCKET_API(float3, vector)
+  NODE_SOCKET_API(float, w)
 };
 
 class MappingNode : public ShaderNode {
@@ -441,8 +483,11 @@ class MappingNode : public ShaderNode {
   }
   void constant_fold(const ConstantFolder &folder);
 
-  float3 vector, location, rotation, scale;
-  NodeMappingType type;
+  NODE_SOCKET_API(float3, vector)
+  NODE_SOCKET_API(float3, location)
+  NODE_SOCKET_API(float3, rotation)
+  NODE_SOCKET_API(float3, scale)
+  NODE_SOCKET_API(NodeMappingType, mapping_type)
 };
 
 class RGBToBWNode : public ShaderNode {
@@ -450,7 +495,7 @@ class RGBToBWNode : public ShaderNode {
   SHADER_NODE_CLASS(RGBToBWNode)
   void constant_fold(const ConstantFolder &folder);
 
-  float3 color;
+  NODE_SOCKET_API(float3, color)
 };
 
 class ConvertNode : public ShaderNode {
@@ -460,6 +505,7 @@ class ConvertNode : public ShaderNode {
 
   void constant_fold(const ConstantFolder &folder);
 
+ private:
   SocketType::Type from, to;
 
   union {
@@ -472,7 +518,6 @@ class ConvertNode : public ShaderNode {
   };
   ustring value_string;
 
- private:
   static const int MAX_TYPE = 12;
   static bool register_types();
   static Node *create(const NodeType *type);
@@ -500,6 +545,7 @@ class BsdfBaseNode : public ShaderNode {
     return false;
   }
 
+ protected:
   ClosureType closure;
 };
 
@@ -514,18 +560,20 @@ class BsdfNode : public BsdfBaseNode {
                ShaderInput *param3 = NULL,
                ShaderInput *param4 = NULL);
 
-  float3 color;
-  float3 normal;
-  float surface_mix_weight;
+  NODE_SOCKET_API(float3, color)
+  NODE_SOCKET_API(float3, normal)
+  NODE_SOCKET_API(float, surface_mix_weight)
 };
 
 class AnisotropicBsdfNode : public BsdfNode {
  public:
   SHADER_NODE_CLASS(AnisotropicBsdfNode)
 
-  float3 tangent;
-  float roughness, anisotropy, rotation;
-  ClosureType distribution;
+  NODE_SOCKET_API(float3, tangent)
+  NODE_SOCKET_API(float, roughness)
+  NODE_SOCKET_API(float, anisotropy)
+  NODE_SOCKET_API(float, rotation)
+  NODE_SOCKET_API(ClosureType, distribution)
 
   ClosureType get_closure_type()
   {
@@ -542,7 +590,7 @@ class DiffuseBsdfNode : public BsdfNode {
  public:
   SHADER_NODE_CLASS(DiffuseBsdfNode)
 
-  float roughness;
+  NODE_SOCKET_API(float, roughness)
 };
 
 /* Disney principled BRDF */
@@ -570,19 +618,37 @@ class PrincipledBsdfNode : public BsdfBaseNode {
                ShaderInput *anisotropic_rotation,
                ShaderInput *transmission_roughness);
 
-  float3 base_color;
-  float3 subsurface_color, subsurface_radius;
-  float metallic, subsurface, specular, roughness, specular_tint, anisotropic, sheen, sheen_tint,
-      clearcoat, clearcoat_roughness, ior, transmission, anisotropic_rotation,
-      transmission_roughness;
-  float3 normal, clearcoat_normal, tangent;
-  float surface_mix_weight;
-  ClosureType distribution, distribution_orig;
-  ClosureType subsurface_method;
-  float3 emission;
-  float emission_strength;
-  float alpha;
+  NODE_SOCKET_API(float3, base_color)
+  NODE_SOCKET_API(float3, subsurface_color)
+  NODE_SOCKET_API(float3, subsurface_radius)
+  NODE_SOCKET_API(float, metallic)
+  NODE_SOCKET_API(float, subsurface)
+  NODE_SOCKET_API(float, specular)
+  NODE_SOCKET_API(float, roughness)
+  NODE_SOCKET_API(float, specular_tint)
+  NODE_SOCKET_API(float, anisotropic)
+  NODE_SOCKET_API(float, sheen)
+  NODE_SOCKET_API(float, sheen_tint)
+  NODE_SOCKET_API(float, clearcoat)
+  NODE_SOCKET_API(float, clearcoat_roughness)
+  NODE_SOCKET_API(float, ior)
+  NODE_SOCKET_API(float, transmission)
+  NODE_SOCKET_API(float, anisotropic_rotation)
+  NODE_SOCKET_API(float, transmission_roughness)
+  NODE_SOCKET_API(float3, normal)
+  NODE_SOCKET_API(float3, clearcoat_normal)
+  NODE_SOCKET_API(float3, tangent)
+  NODE_SOCKET_API(float, surface_mix_weight)
+  NODE_SOCKET_API(ClosureType, distribution)
+  NODE_SOCKET_API(ClosureType, subsurface_method)
+  NODE_SOCKET_API(float3, emission)
+  NODE_SOCKET_API(float, emission_strength)
+  NODE_SOCKET_API(float, alpha)
 
+ private:
+  ClosureType distribution_orig;
+
+ public:
   bool has_integrator_dependency();
   void attributes(Shader *shader, AttributeRequestSet *attributes);
   bool has_attribute_dependency()
@@ -610,7 +676,7 @@ class VelvetBsdfNode : public BsdfNode {
  public:
   SHADER_NODE_CLASS(VelvetBsdfNode)
 
-  float sigma;
+  NODE_SOCKET_API(float, sigma)
 };
 
 class GlossyBsdfNode : public BsdfNode {
@@ -624,8 +690,12 @@ class GlossyBsdfNode : public BsdfNode {
     return distribution;
   }
 
-  float roughness, roughness_orig;
-  ClosureType distribution, distribution_orig;
+  NODE_SOCKET_API(float, roughness)
+  NODE_SOCKET_API(ClosureType, distribution)
+
+ private:
+  float roughness_orig;
+  ClosureType distribution_orig;
 };
 
 class GlassBsdfNode : public BsdfNode {
@@ -639,8 +709,13 @@ class GlassBsdfNode : public BsdfNode {
     return distribution;
   }
 
-  float roughness, roughness_orig, IOR;
-  ClosureType distribution, distribution_orig;
+  NODE_SOCKET_API(float, roughness)
+  NODE_SOCKET_API(float, IOR)
+  NODE_SOCKET_API(ClosureType, distribution)
+
+ private:
+  float roughness_orig;
+  ClosureType distribution_orig;
 };
 
 class RefractionBsdfNode : public BsdfNode {
@@ -654,16 +729,22 @@ class RefractionBsdfNode : public BsdfNode {
     return distribution;
   }
 
-  float roughness, roughness_orig, IOR;
-  ClosureType distribution, distribution_orig;
+  NODE_SOCKET_API(float, roughness)
+  NODE_SOCKET_API(float, IOR)
+  NODE_SOCKET_API(ClosureType, distribution)
+
+ private:
+  float roughness_orig;
+  ClosureType distribution_orig;
 };
 
 class ToonBsdfNode : public BsdfNode {
  public:
   SHADER_NODE_CLASS(ToonBsdfNode)
 
-  float smooth, size;
-  ClosureType component;
+  NODE_SOCKET_API(float, smooth)
+  NODE_SOCKET_API(float, size)
+  NODE_SOCKET_API(ClosureType, component)
 };
 
 class SubsurfaceScatteringNode : public BsdfNode {
@@ -679,11 +760,11 @@ class SubsurfaceScatteringNode : public BsdfNode {
     return falloff;
   }
 
-  float scale;
-  float3 radius;
-  float sharpness;
-  float texture_blur;
-  ClosureType falloff;
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(float3, radius)
+  NODE_SOCKET_API(float, sharpness)
+  NODE_SOCKET_API(float, texture_blur)
+  NODE_SOCKET_API(ClosureType, falloff)
 };
 
 class EmissionNode : public ShaderNode {
@@ -700,9 +781,9 @@ class EmissionNode : public ShaderNode {
     return true;
   }
 
-  float3 color;
-  float strength;
-  float surface_mix_weight;
+  NODE_SOCKET_API(float3, color)
+  NODE_SOCKET_API(float, strength)
+  NODE_SOCKET_API(float, surface_mix_weight)
 };
 
 class BackgroundNode : public ShaderNode {
@@ -710,9 +791,9 @@ class BackgroundNode : public ShaderNode {
   SHADER_NODE_CLASS(BackgroundNode)
   void constant_fold(const ConstantFolder &folder);
 
-  float3 color;
-  float strength;
-  float surface_mix_weight;
+  NODE_SOCKET_API(float3, color)
+  NODE_SOCKET_API(float, strength)
+  NODE_SOCKET_API(float, surface_mix_weight)
 };
 
 class HoldoutNode : public ShaderNode {
@@ -727,8 +808,8 @@ class HoldoutNode : public ShaderNode {
     return CLOSURE_HOLDOUT_ID;
   }
 
-  float surface_mix_weight;
-  float volume_mix_weight;
+  NODE_SOCKET_API(float, surface_mix_weight)
+  NODE_SOCKET_API(float, volume_mix_weight)
 };
 
 class AmbientOcclusionNode : public ShaderNode {
@@ -748,13 +829,13 @@ class AmbientOcclusionNode : public ShaderNode {
     return true;
   }
 
-  float3 color;
-  float distance;
-  float3 normal;
-  int samples;
+  NODE_SOCKET_API(float3, color)
+  NODE_SOCKET_API(float, distance)
+  NODE_SOCKET_API(float3, normal)
+  NODE_SOCKET_API(int, samples)
 
-  bool only_local;
-  bool inside;
+  NODE_SOCKET_API(bool, only_local)
+  NODE_SOCKET_API(bool, inside)
 };
 
 class VolumeNode : public ShaderNode {
@@ -780,11 +861,14 @@ class VolumeNode : public ShaderNode {
     return true;
   }
 
-  float3 color;
-  float density;
-  float volume_mix_weight;
+  NODE_SOCKET_API(float3, color)
+  NODE_SOCKET_API(float, density)
+  NODE_SOCKET_API(float, volume_mix_weight)
+
+ protected:
   ClosureType closure;
 
+ public:
   virtual bool equals(const ShaderNode & /*other*/)
   {
     /* TODO(sergey): With some care Volume nodes can be de-duplicated. */
@@ -801,7 +885,7 @@ class ScatterVolumeNode : public VolumeNode {
  public:
   SHADER_NODE_CLASS(ScatterVolumeNode)
 
-  float anisotropy;
+  NODE_SOCKET_API(float, anisotropy)
 };
 
 class PrincipledVolumeNode : public VolumeNode {
@@ -813,17 +897,17 @@ class PrincipledVolumeNode : public VolumeNode {
     return true;
   }
 
-  ustring density_attribute;
-  ustring color_attribute;
-  ustring temperature_attribute;
+  NODE_SOCKET_API(ustring, density_attribute)
+  NODE_SOCKET_API(ustring, color_attribute)
+  NODE_SOCKET_API(ustring, temperature_attribute)
 
-  float anisotropy;
-  float3 absorption_color;
-  float emission_strength;
-  float3 emission_color;
-  float blackbody_intensity;
-  float3 blackbody_tint;
-  float temperature;
+  NODE_SOCKET_API(float, anisotropy)
+  NODE_SOCKET_API(float3, absorption_color)
+  NODE_SOCKET_API(float, emission_strength)
+  NODE_SOCKET_API(float3, emission_color)
+  NODE_SOCKET_API(float, blackbody_intensity)
+  NODE_SOCKET_API(float3, blackbody_tint)
+  NODE_SOCKET_API(float, temperature)
 };
 
 /* Interface between the I/O sockets and the SVM/OSL backend. */
@@ -833,36 +917,36 @@ class PrincipledHairBsdfNode : public BsdfBaseNode {
   void attributes(Shader *shader, AttributeRequestSet *attributes);
 
   /* Longitudinal roughness. */
-  float roughness;
+  NODE_SOCKET_API(float, roughness)
   /* Azimuthal roughness. */
-  float radial_roughness;
+  NODE_SOCKET_API(float, radial_roughness)
   /* Randomization factor for roughnesses. */
-  float random_roughness;
+  NODE_SOCKET_API(float, random_roughness)
   /* Longitudinal roughness factor for only the diffuse bounce (shiny undercoat). */
-  float coat;
+  NODE_SOCKET_API(float, coat)
   /* Index of reflection. */
-  float ior;
+  NODE_SOCKET_API(float, ior)
   /* Cuticle tilt angle. */
-  float offset;
+  NODE_SOCKET_API(float, offset)
   /* Direct coloring's color. */
-  float3 color;
+  NODE_SOCKET_API(float3, color)
   /* Melanin concentration. */
-  float melanin;
+  NODE_SOCKET_API(float, melanin)
   /* Melanin redness ratio. */
-  float melanin_redness;
+  NODE_SOCKET_API(float, melanin_redness)
   /* Dye color. */
-  float3 tint;
+  NODE_SOCKET_API(float3, tint)
   /* Randomization factor for melanin quantities. */
-  float random_color;
+  NODE_SOCKET_API(float, random_color)
   /* Absorption coefficient (unfiltered). */
-  float3 absorption_coefficient;
+  NODE_SOCKET_API(float3, absorption_coefficient)
 
-  float3 normal;
-  float surface_mix_weight;
+  NODE_SOCKET_API(float3, normal)
+  NODE_SOCKET_API(float, surface_mix_weight)
   /* If linked, here will be the given random number. */
-  float random;
+  NODE_SOCKET_API(float, random)
   /* Selected coloring parametrization. */
-  NodePrincipledHairParametrization parametrization;
+  NODE_SOCKET_API(NodePrincipledHairParametrization, parametrization)
 };
 
 class HairBsdfNode : public BsdfNode {
@@ -873,11 +957,11 @@ class HairBsdfNode : public BsdfNode {
     return component;
   }
 
-  ClosureType component;
-  float offset;
-  float roughness_u;
-  float roughness_v;
-  float3 tangent;
+  NODE_SOCKET_API(ClosureType, component)
+  NODE_SOCKET_API(float, offset)
+  NODE_SOCKET_API(float, roughness_u)
+  NODE_SOCKET_API(float, roughness_v)
+  NODE_SOCKET_API(float3, tangent)
 };
 
 class GeometryNode : public ShaderNode {
@@ -894,7 +978,7 @@ class GeometryNode : public ShaderNode {
   }
   int get_group();
 
-  float3 normal_osl;
+  NODE_SOCKET_API(float3, normal_osl)
 };
 
 class TextureCoordinateNode : public ShaderNode {
@@ -910,10 +994,10 @@ class TextureCoordinateNode : public ShaderNode {
     return true;
   }
 
-  float3 normal_osl;
-  bool from_dupli;
-  bool use_transform;
-  Transform ob_tfm;
+  NODE_SOCKET_API(float3, normal_osl)
+  NODE_SOCKET_API(bool, from_dupli)
+  NODE_SOCKET_API(bool, use_transform)
+  NODE_SOCKET_API(Transform, ob_tfm)
 };
 
 class UVMapNode : public ShaderNode {
@@ -933,8 +1017,8 @@ class UVMapNode : public ShaderNode {
     return NODE_GROUP_LEVEL_1;
   }
 
-  ustring attribute;
-  bool from_dupli;
+  NODE_SOCKET_API(ustring, attribute)
+  NODE_SOCKET_API(bool, from_dupli)
 };
 
 class LightPathNode : public ShaderNode {
@@ -958,8 +1042,8 @@ class LightFalloffNode : public ShaderNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  float strength;
-  float smooth;
+  NODE_SOCKET_API(float, strength)
+  NODE_SOCKET_API(float, smooth)
 };
 
 class ObjectInfoNode : public ShaderNode {
@@ -1036,7 +1120,7 @@ class VertexColorNode : public ShaderNode {
     return true;
   }
 
-  ustring layer_name;
+  NODE_SOCKET_API(ustring, layer_name)
 };
 
 class ValueNode : public ShaderNode {
@@ -1045,7 +1129,7 @@ class ValueNode : public ShaderNode {
 
   void constant_fold(const ConstantFolder &folder);
 
-  float value;
+  NODE_SOCKET_API(float, value)
 };
 
 class ColorNode : public ShaderNode {
@@ -1054,7 +1138,7 @@ class ColorNode : public ShaderNode {
 
   void constant_fold(const ConstantFolder &folder);
 
-  float3 value;
+  NODE_SOCKET_API(float3, value)
 };
 
 class AddClosureNode : public ShaderNode {
@@ -1068,15 +1152,15 @@ class MixClosureNode : public ShaderNode {
   SHADER_NODE_CLASS(MixClosureNode)
   void constant_fold(const ConstantFolder &folder);
 
-  float fac;
+  NODE_SOCKET_API(float, fac)
 };
 
 class MixClosureWeightNode : public ShaderNode {
  public:
   SHADER_NODE_CLASS(MixClosureWeightNode)
 
-  float weight;
-  float fac;
+  NODE_SOCKET_API(float, weight)
+  NODE_SOCKET_API(float, fac)
 };
 
 class InvertNode : public ShaderNode {
@@ -1088,8 +1172,8 @@ class InvertNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float fac;
-  float3 color;
+  NODE_SOCKET_API(float, fac)
+  NODE_SOCKET_API(float3, color)
 };
 
 class MixNode : public ShaderNode {
@@ -1102,11 +1186,11 @@ class MixNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  NodeMix type;
-  bool use_clamp;
-  float3 color1;
-  float3 color2;
-  float fac;
+  NODE_SOCKET_API(NodeMix, mix_type)
+  NODE_SOCKET_API(bool, use_clamp)
+  NODE_SOCKET_API(float3, color1)
+  NODE_SOCKET_API(float3, color2)
+  NODE_SOCKET_API(float, fac)
 };
 
 class CombineRGBNode : public ShaderNode {
@@ -1118,7 +1202,9 @@ class CombineRGBNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float r, g, b;
+  NODE_SOCKET_API(float, r)
+  NODE_SOCKET_API(float, g)
+  NODE_SOCKET_API(float, b)
 };
 
 class CombineHSVNode : public ShaderNode {
@@ -1130,7 +1216,9 @@ class CombineHSVNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float h, s, v;
+  NODE_SOCKET_API(float, h)
+  NODE_SOCKET_API(float, s)
+  NODE_SOCKET_API(float, v)
 };
 
 class CombineXYZNode : public ShaderNode {
@@ -1142,7 +1230,9 @@ class CombineXYZNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float x, y, z;
+  NODE_SOCKET_API(float, x)
+  NODE_SOCKET_API(float, y)
+  NODE_SOCKET_API(float, z)
 };
 
 class GammaNode : public ShaderNode {
@@ -1154,8 +1244,8 @@ class GammaNode : public ShaderNode {
     return NODE_GROUP_LEVEL_1;
   }
 
-  float3 color;
-  float gamma;
+  NODE_SOCKET_API(float3, color)
+  NODE_SOCKET_API(float, gamma)
 };
 
 class BrightContrastNode : public ShaderNode {
@@ -1167,9 +1257,9 @@ class BrightContrastNode : public ShaderNode {
     return NODE_GROUP_LEVEL_1;
   }
 
-  float3 color;
-  float bright;
-  float contrast;
+  NODE_SOCKET_API(float3, color)
+  NODE_SOCKET_API(float, bright)
+  NODE_SOCKET_API(float, contrast)
 };
 
 class SeparateRGBNode : public ShaderNode {
@@ -1181,7 +1271,7 @@ class SeparateRGBNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float3 color;
+  NODE_SOCKET_API(float3, color)
 };
 
 class SeparateHSVNode : public ShaderNode {
@@ -1193,7 +1283,7 @@ class SeparateHSVNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float3 color;
+  NODE_SOCKET_API(float3, color)
 };
 
 class SeparateXYZNode : public ShaderNode {
@@ -1205,18 +1295,18 @@ class SeparateXYZNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float3 vector;
+  NODE_SOCKET_API(float3, vector)
 };
 
 class HSVNode : public ShaderNode {
  public:
   SHADER_NODE_CLASS(HSVNode)
 
-  float hue;
-  float saturation;
-  float value;
-  float fac;
-  float3 color;
+  NODE_SOCKET_API(float, hue)
+  NODE_SOCKET_API(float, saturation)
+  NODE_SOCKET_API(float, value)
+  NODE_SOCKET_API(float, fac)
+  NODE_SOCKET_API(float3, color)
 };
 
 class AttributeNode : public ShaderNode {
@@ -1232,7 +1322,7 @@ class AttributeNode : public ShaderNode {
     return true;
   }
 
-  ustring attribute;
+  NODE_SOCKET_API(ustring, attribute)
 };
 
 class CameraNode : public ShaderNode {
@@ -1260,8 +1350,8 @@ class FresnelNode : public ShaderNode {
     return NODE_GROUP_LEVEL_1;
   }
 
-  float3 normal;
-  float IOR;
+  NODE_SOCKET_API(float3, normal)
+  NODE_SOCKET_API(float, IOR)
 };
 
 class LayerWeightNode : public ShaderNode {
@@ -1276,8 +1366,8 @@ class LayerWeightNode : public ShaderNode {
     return NODE_GROUP_LEVEL_1;
   }
 
-  float3 normal;
-  float blend;
+  NODE_SOCKET_API(float3, normal)
+  NODE_SOCKET_API(float, blend)
 };
 
 class WireframeNode : public ShaderNode {
@@ -1292,8 +1382,8 @@ class WireframeNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float size;
-  bool use_pixel_size;
+  NODE_SOCKET_API(float, size)
+  NODE_SOCKET_API(bool, use_pixel_size)
 };
 
 class WavelengthNode : public ShaderNode {
@@ -1304,7 +1394,7 @@ class WavelengthNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float wavelength;
+  NODE_SOCKET_API(float, wavelength)
 };
 
 class BlackbodyNode : public ShaderNode {
@@ -1316,7 +1406,7 @@ class BlackbodyNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  float temperature;
+  NODE_SOCKET_API(float, temperature)
 };
 
 class MapRangeNode : public ShaderNode {
@@ -1328,9 +1418,14 @@ class MapRangeNode : public ShaderNode {
   }
   void expand(ShaderGraph *graph);
 
-  float value, from_min, from_max, to_min, to_max, steps;
-  NodeMapRangeType type;
-  bool clamp;
+  NODE_SOCKET_API(float, value)
+  NODE_SOCKET_API(float, from_min)
+  NODE_SOCKET_API(float, from_max)
+  NODE_SOCKET_API(float, to_min)
+  NODE_SOCKET_API(float, to_max)
+  NODE_SOCKET_API(float, steps)
+  NODE_SOCKET_API(NodeMapRangeType, range_type)
+  NODE_SOCKET_API(bool, clamp)
 };
 
 class ClampNode : public ShaderNode {
@@ -1341,8 +1436,10 @@ class ClampNode : public ShaderNode {
   {
     return NODE_GROUP_LEVEL_3;
   }
-  float value, min, max;
-  NodeClampType type;
+  NODE_SOCKET_API(float, value)
+  NODE_SOCKET_API(float, min)
+  NODE_SOCKET_API(float, max)
+  NODE_SOCKET_API(NodeClampType, clamp_type)
 };
 
 class MathNode : public ShaderNode {
@@ -1355,11 +1452,11 @@ class MathNode : public ShaderNode {
   void expand(ShaderGraph *graph);
   void constant_fold(const ConstantFolder &folder);
 
-  float value1;
-  float value2;
-  float value3;
-  NodeMathType type;
-  bool use_clamp;
+  NODE_SOCKET_API(float, value1)
+  NODE_SOCKET_API(float, value2)
+  NODE_SOCKET_API(float, value3)
+  NODE_SOCKET_API(NodeMathType, math_type)
+  NODE_SOCKET_API(bool, use_clamp)
 };
 
 class NormalNode : public ShaderNode {
@@ -1370,8 +1467,8 @@ class NormalNode : public ShaderNode {
     return NODE_GROUP_LEVEL_2;
   }
 
-  float3 direction;
-  float3 normal;
+  NODE_SOCKET_API(float3, direction)
+  NODE_SOCKET_API(float3, normal)
 };
 
 class VectorMathNode : public ShaderNode {
@@ -1383,11 +1480,11 @@ class VectorMathNode : public ShaderNode {
   }
   void constant_fold(const ConstantFolder &folder);
 
-  float3 vector1;
-  float3 vector2;
-  float3 vector3;
-  float scale;
-  NodeVectorMathType type;
+  NODE_SOCKET_API(float3, vector1)
+  NODE_SOCKET_API(float3, vector2)
+  NODE_SOCKET_API(float3, vector3)
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(NodeVectorMathType, math_type)
 };
 
 class VectorRotateNode : public ShaderNode {
@@ -1398,13 +1495,13 @@ class VectorRotateNode : public ShaderNode {
   {
     return NODE_GROUP_LEVEL_3;
   }
-  NodeVectorRotateType type;
-  bool invert;
-  float3 vector;
-  float3 center;
-  float3 axis;
-  float angle;
-  float3 rotation;
+  NODE_SOCKET_API(NodeVectorRotateType, rotate_type)
+  NODE_SOCKET_API(bool, invert)
+  NODE_SOCKET_API(float3, vector)
+  NODE_SOCKET_API(float3, center)
+  NODE_SOCKET_API(float3, axis)
+  NODE_SOCKET_API(float, angle)
+  NODE_SOCKET_API(float3, rotation)
 };
 
 class VectorTransformNode : public ShaderNode {
@@ -1416,10 +1513,10 @@ class VectorTransformNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  NodeVectorTransformType type;
-  NodeVectorTransformConvertSpace convert_from;
-  NodeVectorTransformConvertSpace convert_to;
-  float3 vector;
+  NODE_SOCKET_API(NodeVectorTransformType, transform_type)
+  NODE_SOCKET_API(NodeVectorTransformConvertSpace, convert_from)
+  NODE_SOCKET_API(NodeVectorTransformConvertSpace, convert_to)
+  NODE_SOCKET_API(float3, vector)
 };
 
 class BumpNode : public ShaderNode {
@@ -1435,15 +1532,15 @@ class BumpNode : public ShaderNode {
     return NODE_FEATURE_BUMP;
   }
 
-  bool invert;
-  bool use_object_space;
-  float height;
-  float sample_center;
-  float sample_x;
-  float sample_y;
-  float3 normal;
-  float strength;
-  float distance;
+  NODE_SOCKET_API(bool, invert)
+  NODE_SOCKET_API(bool, use_object_space)
+  NODE_SOCKET_API(float, height)
+  NODE_SOCKET_API(float, sample_center)
+  NODE_SOCKET_API(float, sample_x)
+  NODE_SOCKET_API(float, sample_y)
+  NODE_SOCKET_API(float3, normal)
+  NODE_SOCKET_API(float, strength)
+  NODE_SOCKET_API(float, distance)
 };
 
 class CurvesNode : public ShaderNode {
@@ -1456,9 +1553,11 @@ class CurvesNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  array<float3> curves;
-  float min_x, max_x, fac;
-  float3 value;
+  NODE_SOCKET_API(array<float3>, curves)
+  NODE_SOCKET_API(float, min_x)
+  NODE_SOCKET_API(float, max_x)
+  NODE_SOCKET_API(float, fac)
+  NODE_SOCKET_API(float3, value)
 
  protected:
   using ShaderNode::constant_fold;
@@ -1488,16 +1587,16 @@ class RGBRampNode : public ShaderNode {
     return NODE_GROUP_LEVEL_1;
   }
 
-  array<float3> ramp;
-  array<float> ramp_alpha;
-  float fac;
-  bool interpolate;
+  NODE_SOCKET_API(array<float3>, ramp)
+  NODE_SOCKET_API(array<float>, ramp_alpha)
+  NODE_SOCKET_API(float, fac)
+  NODE_SOCKET_API(bool, interpolate)
 };
 
 class SetNormalNode : public ShaderNode {
  public:
   SHADER_NODE_CLASS(SetNormalNode)
-  float3 direction;
+  NODE_SOCKET_API(float3, direction)
 };
 
 class OSLNode : public ShaderNode {
@@ -1549,11 +1648,11 @@ class NormalMapNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  NodeNormalMapSpace space;
-  ustring attribute;
-  float strength;
-  float3 color;
-  float3 normal_osl;
+  NODE_SOCKET_API(NodeNormalMapSpace, space)
+  NODE_SOCKET_API(ustring, attribute)
+  NODE_SOCKET_API(float, strength)
+  NODE_SOCKET_API(float3, color)
+  NODE_SOCKET_API(float3, normal_osl)
 };
 
 class TangentNode : public ShaderNode {
@@ -1573,10 +1672,10 @@ class TangentNode : public ShaderNode {
     return NODE_GROUP_LEVEL_3;
   }
 
-  NodeTangentDirectionType direction_type;
-  NodeTangentAxis axis;
-  ustring attribute;
-  float3 normal_osl;
+  NODE_SOCKET_API(NodeTangentDirectionType, direction_type)
+  NODE_SOCKET_API(NodeTangentAxis, axis)
+  NODE_SOCKET_API(ustring, attribute)
+  NODE_SOCKET_API(float3, normal_osl)
 };
 
 class BevelNode : public ShaderNode {
@@ -1595,9 +1694,9 @@ class BevelNode : public ShaderNode {
     return true;
   }
 
-  float radius;
-  float3 normal;
-  int samples;
+  NODE_SOCKET_API(float, radius)
+  NODE_SOCKET_API(float3, normal)
+  NODE_SOCKET_API(int, samples)
 };
 
 class DisplacementNode : public ShaderNode {
@@ -1609,11 +1708,11 @@ class DisplacementNode : public ShaderNode {
     return NODE_FEATURE_BUMP;
   }
 
-  NodeNormalMapSpace space;
-  float height;
-  float midlevel;
-  float scale;
-  float3 normal;
+  NODE_SOCKET_API(NodeNormalMapSpace, space)
+  NODE_SOCKET_API(float, height)
+  NODE_SOCKET_API(float, midlevel)
+  NODE_SOCKET_API(float, scale)
+  NODE_SOCKET_API(float3, normal)
 };
 
 class VectorDisplacementNode : public ShaderNode {
@@ -1630,11 +1729,11 @@ class VectorDisplacementNode : public ShaderNode {
     return NODE_FEATURE_BUMP;
   }
 
-  NodeNormalMapSpace space;
-  ustring attribute;
-  float3 vector;
-  float midlevel;
-  float scale;
+  NODE_SOCKET_API(NodeNormalMapSpace, space)
+  NODE_SOCKET_API(ustring, attribute)
+  NODE_SOCKET_API(float3, vector)
+  NODE_SOCKET_API(float, midlevel)
+  NODE_SOCKET_API(float, scale)
 };
 
 CCL_NAMESPACE_END