blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T60300: Cycles SSS render hanging with AMD OpenCL.

This commit is contained in:
Brecht Van Lommel 2019-01-08 15:35:54 +01:00
parent 1e386d98ce
commit 8491dba0c6
Notes: blender-bot 2023-02-14 11:28:43 +01:00 
Referenced by issue #60300, GPU Fault while rendering scenes with subsurface scattering using OpenCL
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/kernel/split/kernel_subsurface_scatter.h
View File

@ -47,6 +47,11 @@ ccl_device_noinline bool kernel_split_branched_path_subsurface_indirect_light_it
if(!CLOSURE_IS_BSSRDF(sc->type))
continue;
/* Closure memory will be overwritten, so read required variables now. */
Bssrdf *bssrdf = (Bssrdf *)sc;
ClosureType bssrdf_type = sc->type;
float bssrdf_roughness = bssrdf->roughness;
/* set up random number generator */
if(branched_state->ss_next_sample == 0 && branched_state->next_hit == 0 &&
branched_state->next_closure == 0 && branched_state->next_sample == 0)
@ -110,10 +115,6 @@ ccl_device_noinline bool kernel_split_branched_path_subsurface_indirect_light_it
*bssrdf_sd = *sd; /* note: copy happens each iteration of inner loop, this is
* important as the indirect path will write into bssrdf_sd */
Bssrdf *bssrdf = (Bssrdf *)sc;
ClosureType bssrdf_type = sc->type;
float bssrdf_roughness = bssrdf->roughness;
LocalIntersection ss_isect_private = *ss_isect;
subsurface_scatter_multi_setup(kg,
&ss_isect_private,