EEVEE: Fix light culling light count and padd culling tile buffer

2 files changed, 10 insertions, 1 deletions

diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c
index cfcc54b1136..9884e31f5a7 100644
--- a/source/blender/blenlib/intern/math_base_inline.c
+++ b/source/blender/blenlib/intern/math_base_inline.c
@@ -388,6 +388,14 @@ MINLINE uint divide_ceil_u(uint a, uint b)
   return (a + b - 1) / b;
 }
 
+/**
+ * Return the next multiple of `b` after `a`.
+ */
+MINLINE uint ceil_multiple_u(uint a, uint b)
+{
+  return ((a + b - 1) / b) * b;
+}
+
 MINLINE int mod_i(int i, int n)
 {
   return (i % n + n) % n;
diff --git a/source/blender/draw/engines/eevee/eevee_light.cc b/source/blender/draw/engines/eevee/eevee_light.cc
index 178c42130a9..806488edea2 100644
--- a/source/blender/draw/engines/eevee/eevee_light.cc
+++ b/source/blender/draw/engines/eevee/eevee_light.cc
@@ -435,6 +435,7 @@ void LightModule::set_view(const DRWView *view, const int2 extent, bool enable_s
 
   culling_data.enable_specular = enable_specular;
   culling_data.items_count = no_lights ? 0 : light_refs_.size();
+  culling_data.items_no_cull_count = no_lights ? 0 : culling_data.items_no_cull_count;
   culling_data.visible_count = 0;
   culling_data.push_update();
 
@@ -445,7 +446,7 @@ void LightModule::set_view(const DRWView *view, const int2 extent, bool enable_s
   uint word_count = tiles_extent.x * tiles_extent.y * tiles_extent.z * culling_data.tile_word_len;
 
   /* TODO(fclem) Only resize once per redraw. */
-  culling_tile_buf.resize(word_count);
+  culling_tile_buf.resize(ceil_multiple_u(word_count, 4u));
 
   culling_tile_dispatch_size_.x = divide_ceil_u(word_count, 1024);
   culling_tile_dispatch_size_.y = 1;