diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2020-04-14 16:29:09 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2020-04-16 09:32:34 +0300 |
| commit | ef19cd395fab3273e876010db1f2858df5d2f93f (patch) | |
| tree | bcbde6a376ba2a5633bb0ca49fea63ceca06f47b /source/blender/draw/engines/workbench | |
| parent | f0221ff6674f0848fb973667aed0e9c299219304 (diff) | |
Fix T75455: High World Space Cavity Samples Crash
When setting the number of cavity samples to a high number blender could
write out of bounds.
This patch will harmonize the number of iterations in the same way how
it is done during execution.
Reviewed By: Clément Foucault
Differential Revision: https://developer.blender.org/D7425
Diffstat (limited to 'source/blender/draw/engines/workbench')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_effect_cavity.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_effect_cavity.c b/source/blender/draw/engines/workbench/workbench_effect_cavity.c index cdf8a93fc57..4a8db65c02e 100644 --- a/source/blender/draw/engines/workbench/workbench_effect_cavity.c +++ b/source/blender/draw/engines/workbench/workbench_effect_cavity.c @@ -42,11 +42,11 @@ /* Using Hammersley distribution */ static float *create_disk_samples(int num_samples, int num_iterations) { + BLI_assert(num_samples * num_iterations <= CAVITY_MAX_SAMPLES); const int total_samples = num_samples * num_iterations; const float num_samples_inv = 1.0f / num_samples; /* vec4 to ensure memory alignment. */ float(*texels)[4] = MEM_callocN(sizeof(float[4]) * CAVITY_MAX_SAMPLES, __func__); - for (int i = 0; i < total_samples; i++) { float it_add = (i / num_samples) * 0.499f; float r = fmodf((i + 0.5f + it_add) * num_samples_inv, 1.0f); @@ -102,7 +102,7 @@ void workbench_cavity_data_update(WORKBENCH_PrivateData *wpd, WORKBENCH_UBO_Worl if (CAVITY_ENABLED(wpd)) { int cavity_sample_count_single_iteration = scene->display.matcap_ssao_samples; int cavity_sample_count_total = workbench_cavity_total_sample_count(wpd, scene); - int max_iter_count = cavity_sample_count_total / cavity_sample_count_single_iteration; + const int max_iter_count = cavity_sample_count_total / cavity_sample_count_single_iteration; int sample = wpd->taa_sample % max_iter_count; wd->cavity_sample_start = cavity_sample_count_single_iteration * sample; @@ -128,6 +128,7 @@ void workbench_cavity_samples_ubo_ensure(WORKBENCH_PrivateData *wpd) int cavity_sample_count_single_iteration = scene->display.matcap_ssao_samples; int cavity_sample_count = workbench_cavity_total_sample_count(wpd, scene); + const int max_iter_count = max_ii(1, cavity_sample_count / cavity_sample_count_single_iteration); if (wpd->vldata->cavity_sample_count != cavity_sample_count) { DRW_UBO_FREE_SAFE(wpd->vldata->cavity_sample_ubo); @@ -135,8 +136,7 @@ void workbench_cavity_samples_ubo_ensure(WORKBENCH_PrivateData *wpd) } if (wpd->vldata->cavity_sample_ubo == NULL) { - float *samples = create_disk_samples(cavity_sample_count_single_iteration, - max_ii(1, wpd->taa_sample_len)); + float *samples = create_disk_samples(cavity_sample_count_single_iteration, max_iter_count); wpd->vldata->cavity_jitter_tx = create_jitter_texture(cavity_sample_count); /* NOTE: Uniform buffer needs to always be filled to be valid. */ wpd->vldata->cavity_sample_ubo = DRW_uniformbuffer_create( |