diff options
| author | Patrick Mours <pmours@nvidia.com> | 2019-08-26 16:55:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-26 17:07:01 +0300 |
| commit | 1ff939f3f7d5cba72fddc5cc0b4a1bcf936bd64d (patch) | |
| tree | 823411c19d40e4b7bc892c7b725b0c448c428ca7 /intern | |
| parent | 6055db084d32e945bf5fbc6bdaf9b24507495737 (diff) | |
Cleanup: avoid unnecessary primitive type lookup and variable initialization
Ref D5363
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_emission.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_shader.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h index 9761dbfcc6d..459280cf433 100644 --- a/intern/cycles/kernel/kernel_emission.h +++ b/intern/cycles/kernel/kernel_emission.h @@ -242,8 +242,6 @@ ccl_device_noinline_cpu bool indirect_lamp_emission(KernelGlobals *kg, { bool hit_lamp = false; - *emission = make_float3(0.0f, 0.0f, 0.0f); - for (int lamp = 0; lamp < kernel_data.integrator.num_all_lights; lamp++) { LightSample ls ccl_optional_struct_init; diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h index 4688857b718..b8202326cdf 100644 --- a/intern/cycles/kernel/kernel_shader.h +++ b/intern/cycles/kernel/kernel_shader.h @@ -1356,7 +1356,7 @@ ccl_device bool shader_transparent_shadow(KernelGlobals *kg, Intersection *isect int shader = 0; # ifdef __HAIR__ - if (kernel_tex_fetch(__prim_type, isect->prim) & PRIMITIVE_ALL_TRIANGLE) { + if (isect->type & PRIMITIVE_ALL_TRIANGLE) { # endif shader = kernel_tex_fetch(__tri_shader, prim); # ifdef __HAIR__ |