Fix Cycles hang in classroom scene with upcomping AMD driver version 22.10

This is a workaround until there is a fix in the HIP compiler or driver.

Differential Revision: https://developer.blender.org/D14232
This commit is contained in:
Brecht Van Lommel 2022-03-03 13:38:05 +01:00
parent d961adb866
commit 9c2e385509
1 changed files with 9 additions and 1 deletions

View File

@ -394,11 +394,19 @@ ccl_device bool light_sample_from_distant_ray(KernelGlobals kg,
float costheta = dot(-lightD, ray_D);
float cosangle = klight->distant.cosangle;
/* Workaround to prevent a hang in the classroom scene with AMD HIP drivers 22.10,
* Remove when a compiler fix is available. */
#ifdef __HIP__
ls->shader = klight->shader_id;
#endif
if (costheta < cosangle)
return false;
ls->type = type;
#ifndef __HIP__
ls->shader = klight->shader_id;
#endif
ls->object = PRIM_NONE;
ls->prim = PRIM_NONE;
ls->lamp = lamp;
@ -947,4 +955,4 @@ ccl_device_inline bool light_distribution_sample_new_position(KernelGlobals kg,
}
}
CCL_NAMESPACE_END
CCL_NAMESPACE_END