blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

WIP: eevee-next-world-irradiance #108304

Closed
Jeroen Bakker wants to merge 79 commits from Jeroen-Bakker:eevee-next-world-irradiance into main
pull from: Jeroen-Bakker:eevee-next-world-irradiance
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 79 Files Changed 22 +28 -6
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 95b8b71908 - Show all commits

32
source/blender/draw/engines/eevee_next/eevee_irradiance_cache.cc
View File

@ -50,10 +50,20 @@ void IrradianceCache::init()
brick_pool_.clear(); brick_pool_.clear();
/* Fill with all the available bricks. */ /* Fill with all the available bricks. */
for (auto i : IndexRange(atlas_row_count * atlas_col_count)) { for (auto i : IndexRange(atlas_row_count * atlas_col_count)) {
IrradianceBrick brick; if (i == 0) {
brick.atlas_coord = uint2(i % atlas_col_count, i / atlas_col_count) * /* Reserve one brick for the world. */
IRRADIANCE_GRID_BRICK_SIZE; world_brick_index_ = 0;
brick_pool_.append(irradiance_brick_pack(brick)); }
else {
IrradianceBrick brick;
brick.atlas_coord = uint2(i % atlas_col_count, i / atlas_col_count) *
IRRADIANCE_GRID_BRICK_SIZE;
brick_pool_.append(irradiance_brick_pack(brick));
}
}
if (irradiance_atlas_tx_.is_valid()) {
irradiance_atlas_tx_.clear(float4(0.0f));
} }
} }
@ -117,7 +127,8 @@ void IrradianceCache::set_view(View & /*view*/)
/* TODO frustum cull and only load visible grids. */ /* TODO frustum cull and only load visible grids. */
if (grids_len >= IRRADIANCE_GRID_MAX) { /* Note that we reserve 1 slot for the world irradiance. */
if (grids_len >= IRRADIANCE_GRID_MAX - 1) {
inst_.info = "Error: Too many grid visible"; inst_.info = "Error: Too many grid visible";
continue; continue;
} }
@ -153,8 +164,17 @@ void IrradianceCache::set_view(View & /*view*/)
grid.grid_index = grids_len; grid.grid_index = grids_len;
grids_infos_buf_[grids_len++] = grid; grids_infos_buf_[grids_len++] = grid;
} }
/* TODO: Stable sorting of grids. */
/* TODO(fclem): Insert world grid here. */ {
/* Insert world grid last. */
IrradianceGridData grid;
grid.world_to_grid_transposed = float3x4::identity();
grid.grid_size = int3(1);
grid.brick_offset = bricks_infos_buf_.size();
grids_infos_buf_[grids_len++] = grid;
bricks_infos_buf_.append(world_brick_index_);
}
if (grids_len < IRRADIANCE_GRID_MAX) { if (grids_len < IRRADIANCE_GRID_MAX) {
/* Tag last grid as invalid to stop the iteration. */ /* Tag last grid as invalid to stop the iteration. */

2
source/blender/draw/engines/eevee_next/eevee_irradiance_cache.hh
View File

@ -128,6 +128,8 @@ class IrradianceCache {
/** Atlas 3D texture containing all loaded grid data. */ /** Atlas 3D texture containing all loaded grid data. */
Texture irradiance_atlas_tx_ = {"irradiance_atlas_tx_"}; Texture irradiance_atlas_tx_ = {"irradiance_atlas_tx_"};
/** Reserved atlas brick for world irradiance. */
int world_brick_index_ = 0;
/** Data structure used to index irradiance cache pages inside the atlas. */ /** Data structure used to index irradiance cache pages inside the atlas. */
IrradianceGridDataBuf grids_infos_buf_ = {"grids_infos_buf_"}; IrradianceGridDataBuf grids_infos_buf_ = {"grids_infos_buf_"};
IrradianceBrickBuf bricks_infos_buf_ = {"bricks_infos_buf_"}; IrradianceBrickBuf bricks_infos_buf_ = {"bricks_infos_buf_"};