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

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Clément Foucault
2024-06-29 22:43:49 +02:00
parent 72e5254669 53cb73ecea
commit de7e3f992b
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/draw/engines/eevee_next/shaders/eevee_depth_of_field_resolve_comp.glsl
View File

@@ -20,11 +20,6 @@ shared uint shared_max_slight_focus_abs_coc;
*/
float dof_slight_focus_coc_tile_get(vec2 frag_coord)
{
if (gl_LocalInvocationIndex == 0u) {
shared_max_slight_focus_abs_coc = floatBitsToUint(0.0);
}
barrier();
float local_abs_max = 0.0;
/* Sample in a cross (X) pattern. This covers all pixels over the whole tile, as long as
* dof_max_slight_focus_radius is less than the group size. */
@@ -37,6 +32,11 @@ float dof_slight_focus_coc_tile_get(vec2 frag_coord)
local_abs_max = max(local_abs_max, abs(coc));
}
}
if (gl_LocalInvocationIndex == 0u) {
shared_max_slight_focus_abs_coc = floatBitsToUint(0.0);
}
barrier();
/* Use atomic reduce operation. */
atomicMax(shared_max_slight_focus_abs_coc, floatBitsToUint(local_abs_max));
/* "Broadcast" result across all threads. */
@@ -76,7 +76,7 @@ vec3 dof_neighborhood_clamp(vec2 frag_coord, vec3 color, float center_coc, float
neighbor_max += abs(neighbor_min) * padding;
neighbor_min -= abs(neighbor_min) * padding;
/* Progressively apply the clamp to avoid harsh transition. Also mask by weight. */
float fac = saturate(square(center_coc) * 4.0) * weight;
float fac = saturate(square(max(0.0, abs(center_coc) - 0.5)) * 4.0) * weight;
/* Clamp in YCoCg space to avoid too much color drift. */
color = colorspace_YCoCg_from_scene_linear(color);
color = mix(color, clamp(color, neighbor_min, neighbor_max), fac);

9
source/blender/draw/engines/eevee_next/shaders/eevee_light_shadow_setup_comp.glsl
View File

@@ -252,7 +252,14 @@ void cubeface_sync(int tilemap_id,
void main()
{
uint l_idx = gl_GlobalInvocationID.x;
if (l_idx >= light_cull_buf.items_count) {
/* We are dispatching (with padding) over the culled light array.
* This array is not contiguous. Visible local lights are packed at the begining
* and directional lights at the end. There is a range of uninitialized value in between that
* needs to be avoided. */
bool valid_local = (l_idx < light_cull_buf.visible_count);
bool valid_directional = (l_idx >= light_cull_buf.local_lights_len) &&
(l_idx < light_cull_buf.items_count);
if (!valid_local || !valid_directional) {
return;
}