bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Campbell Barton 2024-07-01 23:34:23 +10:00
commit ec5c7b9519
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/engines/eevee_next/eevee_light.cc
View File

@ -440,9 +440,12 @@ void LightModule::end_sync()
culling_light_buf_.resize(lights_allocated); culling_light_buf_.resize(lights_allocated);
{ {
int2 render_extent = inst_.film.render_extent_get();
int2 probe_extent = int2(inst_.sphere_probes.probe_render_extent());
int2 max_extent = math::max(render_extent, probe_extent);
/* Compute tile size and total word count. */ /* Compute tile size and total word count. */
uint word_per_tile = divide_ceil_u(max_ii(lights_len_, 1), 32); uint word_per_tile = divide_ceil_u(max_ii(lights_len_, 1), 32);
int2 render_extent = inst_.film.render_extent_get();
int2 tiles_extent; int2 tiles_extent;
/* Default to 32 as this is likely to be the maximum /* Default to 32 as this is likely to be the maximum
* tile size used by hardware or compute shading. */ * tile size used by hardware or compute shading. */
@ -450,7 +453,7 @@ void LightModule::end_sync()
bool tile_size_valid = false; bool tile_size_valid = false;
do { do {
tile_size *= 2; tile_size *= 2;
tiles_extent = math::divide_ceil(render_extent, int2(tile_size)); tiles_extent = math::divide_ceil(max_extent, int2(tile_size));
uint tile_count = tiles_extent.x * tiles_extent.y; uint tile_count = tiles_extent.x * tiles_extent.y;
if (tile_count > max_tile_count_threshold) { if (tile_count > max_tile_count_threshold) {
continue; continue;