scripts/startup/bl_ui/properties_data_light.py

@@ -117,8 +117,11 @@ class DATA_PT_EEVEE_light(DataButtonsPanel, Panel):
             col.separator()
 
             col.prop(light, "use_shadow", text="Cast Shadow")
+            col.prop(light, "use_shadow_jittering", text="Shadow Jittering")
+            sub = col.column(align=True)
+            sub.active = light.use_shadow_jittering
+            sub.prop(light, "shadow_jitter_overblur", text="Jittering Overblur")
             col.prop(light, "shadow_softness_factor", text="Shadow Softness")
-            col.prop(light, "shadow_jittering", text="Shadow Jittering")
             col.prop(light, "shadow_filter_radius", text="Filtering Radius")
             col.prop(light, "shadow_resolution_scale", text="Resolution Scale")
 

source/blender/draw/engines/eevee_next/eevee_light.cc

@@ -116,12 +116,16 @@ void Light::sync(ShadowModule &shadows, const Object *ob, float threshold)
          * So we use the original light radius instead. */
         shadow_radius = la->shadow_softness_factor * la->radius;
       }
+      float softness = la->shadow_softness_factor;
+      if (this->do_jittering) {
+        softness *= la->shadow_jitter_overblur;
+      }
       this->punctual->sync(this->type,
                            this->object_mat,
                            la->spotsize,
                            radius,
                            this->influence_radius_max,
-                           la->shadow_softness_factor,
+                           softness,
                            shadow_radius);
     }
   }
@@ -319,9 +323,9 @@ void LightModule::sync_light(const Object *ob, ObjectHandle &handle)
   light.used = true;
 
   ::Light *bl_light = static_cast<::Light *>(ob->data);
-  light.jittering = inst_.shadows.do_jittering() ? bl_light->shadow_jittering : 0.0f;
+  light.do_jittering = inst_.shadows.do_jittering() && bl_light->mode & LA_SHADOW_JITTER;
 
-  if (handle.recalc != 0 || !light.initialized || light.jittering > 0.0f) {
+  if (handle.recalc != 0 || !light.initialized || light.do_jittering) {
     light.initialized = true;
     light.sync(inst_.shadows, ob, light_threshold_);
   }

source/blender/draw/engines/eevee_next/eevee_light.hh

@@ -44,6 +44,7 @@ struct Light : public LightData, NonCopyable {
  public:
   bool initialized = false;
   bool used = false;
+  bool do_jittering;
 
   /** Pointers to source Shadow. Type depends on `LightData::type`. */
   ShadowDirectional *directional = nullptr;

source/blender/draw/engines/eevee_next/eevee_shader_shared.hh

@@ -822,7 +822,7 @@ struct LightData {
   /** Punctual: Shift to apply to the light origin to get the shadow projection origin. */
   float shadow_projection_shift;
   packed_float3 shadow_origin_shift;
-  float jittering;
+  float _pad0;
 };
 BLI_STATIC_ASSERT_ALIGN(LightData, 16)
 

source/blender/draw/engines/eevee_next/eevee_shadow.cc

@@ -348,7 +348,7 @@ void ShadowPunctual::end_sync(Light &light, float lod_bias, Sampling &sampling)
 
   float3 origin_shift = float3(0.0f);
 
-  if (light.jittering > 0.0f) {
+  if (light.do_jittering) {
     /* TODO: de-correlate. */
     float3 random = sampling.rng_3d_get(SAMPLING_SHADOW_U);
     if (is_area_light(light.type)) {
@@ -359,9 +359,8 @@ void ShadowPunctual::end_sync(Light &light, float lod_bias, Sampling &sampling)
     }
     else {
       origin_shift = sampling.sample_ball(random);
-      origin_shift *= sqrtf(light.radius_squared);
+      origin_shift *= shadow_radius_;
     }
-    origin_shift *= light.jittering;
   }
 
   /* Shift shadow map origin for area light to avoid clipping nearby geometry. */

source/blender/draw/engines/eevee_next/shaders/eevee_shadow_tag_usage_lib.glsl

@@ -89,6 +89,8 @@ void shadow_tag_usage_tilemap_punctual(
   }
 
   vec3 lP = light_world_to_local(light, P - light._position);
+  lP -= light.shadow_origin_shift;
+
   float dist_to_light = max(length(lP) - radius, 1e-5);
   if (dist_to_light > light.influence_radius_max) {
     return;
@@ -107,7 +109,6 @@ void shadow_tag_usage_tilemap_punctual(
     }
   }
 
-  lP -= light.shadow_origin_shift;
   lP.z -= light.shadow_projection_shift;
 
   float footprint_ratio = shadow_punctual_footprint_ratio(

source/blender/draw/engines/eevee_next/shaders/eevee_shadow_tracing_lib.glsl

@@ -294,8 +294,6 @@ ShadowRayPunctual shadow_ray_generate_punctual(LightData light,
     random_2d = sample_disk(random_2d);
   }
 
-  random_2d *= 1.0 - light.jittering;
-
   float clip_far = intBitsToFloat(light.clip_far);
   float clip_near = intBitsToFloat(light.clip_near);
   float clip_side = light.clip_side;

source/blender/makesdna/DNA_light_types.h

@@ -79,7 +79,7 @@ typedef struct Light {
   float shadow_trace_distance;
   float shadow_filter_radius;
   float shadow_resolution_scale;
-  float shadow_jittering;
+  float shadow_jitter_overblur;
 
   /* Preview */
   struct PreviewImage *preview;
@@ -142,6 +142,7 @@ enum {
   LA_SHAD_CONTACT = 1 << 19,
   LA_CUSTOM_ATTENUATION = 1 << 20,
   LA_USE_SOFT_FALLOFF = 1 << 21,
+  LA_SHADOW_JITTER = 1 << 22
 };
 
 /** #Light::falloff_type */

source/blender/makesrna/intern/rna_light.cc

@@ -315,10 +315,16 @@ static void rna_def_light_shadow(StructRNA *srna, bool sun)
   RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
   RNA_def_property_update(prop, 0, "rna_Light_update");
 
-  prop = RNA_def_property(srna, "shadow_jittering", PROP_FLOAT, PROP_FACTOR);
+  prop = RNA_def_property(srna, "use_shadow_jittering", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, nullptr, "mode", LA_SHADOW_JITTER);
+  RNA_def_property_ui_text(prop, "Shadow Jittering", "Shadow Jittering (TODO)");
+  RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
+  RNA_def_property_update(prop, 0, "rna_Light_update");
+
+  prop = RNA_def_property(srna, "shadow_jitter_overblur", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_range(prop, 0.0f, 1.0);
   RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1f, 2);
-  RNA_def_property_ui_text(prop, "Shadow Jittering", "Shadow Jittering (TODO)");
+  RNA_def_property_ui_text(prop, "Shadow Jitter Overblur", "Shadow Jitter Overblur (TODO)");
   RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
   RNA_def_property_update(prop, 0, "rna_Light_update");