griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Jeroen Bakker
2024-10-11 10:06:35 +02:00
parent 0b18eaf43c 483f96ce73
commit 8a6d469cfd
4 changed files with 57 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
source/blender/draw/engines/eevee_next/eevee_lightprobe_volume.cc
View File

@@ -28,26 +28,61 @@ void VolumeProbeModule::init()
{
display_grids_enabled_ = DRW_state_draw_support();
int atlas_byte_size = 1024 * 1024 * inst_.scene->eevee.gi_irradiance_pool_size;
/* This might become an option in the future. */
bool use_l2_band = false;
int sh_coef_len = use_l2_band ? 9 : 4;
BLI_assert(VOLUME_PROBE_FORMAT == GPU_RGBA16F);
int texel_byte_size = 8; /* Assumes GPU_RGBA16F. */
int3 atlas_extent(IRRADIANCE_GRID_BRICK_SIZE);
atlas_extent.z *= sh_coef_len;
/* Add space for validity bits. */
atlas_extent.z += IRRADIANCE_GRID_BRICK_SIZE / 4;
uint atlas_col_count = 0;
uint atlas_row_count = 0;
int atlas_col_count = 256;
atlas_extent.x *= atlas_col_count;
/* Determine the row count depending on the scene settings. */
int row_byte_size = atlas_extent.x * atlas_extent.y * atlas_extent.z * texel_byte_size;
int atlas_row_count = divide_ceil_u(atlas_byte_size, row_byte_size);
atlas_extent.y *= atlas_row_count;
if (assign_if_different(irradiance_pool_size_,
(uint)inst_.scene->eevee.gi_irradiance_pool_size) ||
!irradiance_atlas_tx_.is_valid())
{
irradiance_atlas_tx_.free();
/* Find highest pool size within device limits. */
for (uint irradiance_pool_size = irradiance_pool_size_;
irradiance_pool_size >= 16 && !irradiance_atlas_tx_.is_valid();
irradiance_pool_size >>= 1)
{
int atlas_byte_size = 1024 * 1024 * irradiance_pool_size;
/* Reshape texture to improve grid occupancy within device limits. */
constexpr uint atlas_col_count_min = 16;
constexpr uint atlas_col_count_max = 16384;
for (uint atlas_col_count_try = atlas_col_count_min;
atlas_col_count_try <= atlas_col_count_max && !irradiance_atlas_tx_.is_valid();
atlas_col_count_try <<= 1)
{
int3 atlas_extent(IRRADIANCE_GRID_BRICK_SIZE);
atlas_extent.z *= sh_coef_len;
/* Add space for validity bits. */
atlas_extent.z += IRRADIANCE_GRID_BRICK_SIZE / 4;
atlas_extent.x *= atlas_col_count_try;
eGPUTextureUsage usage = GPU_TEXTURE_USAGE_SHADER_WRITE | GPU_TEXTURE_USAGE_SHADER_READ |
GPU_TEXTURE_USAGE_ATTACHMENT;
do_full_update_ = irradiance_atlas_tx_.ensure_3d(VOLUME_PROBE_FORMAT, atlas_extent, usage);
/* Determine the row count depending on the scene settings. */
int row_byte_size = math::reduce_mul(atlas_extent) * texel_byte_size;
atlas_row_count = divide_ceil_u(atlas_byte_size, row_byte_size);
atlas_extent.y *= atlas_row_count;
constexpr eGPUTextureUsage usage = GPU_TEXTURE_USAGE_SHADER_WRITE |
GPU_TEXTURE_USAGE_SHADER_READ |
GPU_TEXTURE_USAGE_ATTACHMENT;
irradiance_atlas_tx_.ensure_3d(VOLUME_PROBE_FORMAT, atlas_extent, usage);
if (irradiance_atlas_tx_.is_valid()) {
do_full_update_ = true;
irradiance_pool_size_alloc_ = irradiance_pool_size;
atlas_col_count = atlas_col_count_try;
}
}
}
}
if (irradiance_pool_size_alloc_ != irradiance_pool_size_) {
inst_.info_append_i18n(
"Warning: Light probes volume pool could not be allocated. Now using a pool of {} MB.",
irradiance_pool_size_alloc_);
}
if (do_full_update_) {
do_update_world_ = true;

6
source/blender/draw/engines/eevee_next/eevee_lightprobe_volume.hh
View File

@@ -208,6 +208,12 @@ class VolumeProbeModule {
PassSimple grid_upload_ps_ = {"VolumeProbeModule.Upload"};
/** If true, will trigger the reupload of all grid data instead of just streaming new ones. */
bool do_full_update_ = true;
/**
* Last used pool size to identify if we can reuse previous irradiance atlas texture. Ref
* SceneEEVEE.gi_irradiance_pool_size */
uint irradiance_pool_size_ = 0;
/** Actual pool size allocated on device. Can be different due to limits. */
uint irradiance_pool_size_alloc_ = 0;
/** Display debug data. */
PassSimple debug_ps_ = {"VolumeProbeModule.Debug"};

2
source/blender/draw/engines/eevee_next/eevee_shadow.cc
View File

@@ -652,7 +652,7 @@ void ShadowModule::init()
shadow_page_len_);
}
if (stats.view_needed_count > SHADOW_VIEW_MAX && enabled_) {
inst_.info_append_i18n("Error: Too many shadow updates, some shadow might be incorrect.");
inst_.info_append_i18n("Error: Too many shadow updates, some shadows might be incorrect.");
}
}

2
source/blender/draw/intern/DRW_gpu_wrapper.hh
View File

@@ -1013,7 +1013,7 @@ class Texture : NonCopyable {
}
if (tx_ == nullptr) {
tx_ = create(w, h, d, mip_len, format, usage, data, layered, cubemap);
if (data == nullptr && (G.debug & G_DEBUG_GPU)) {
if (is_valid() && data == nullptr && (G.debug & G_DEBUG_GPU)) {
debug_clear();
}
return true;