[Bf-blender-cvs] [1ff939f3f7d] master: Cleanup: avoid unnecessary primitive type lookup and variable initialization

[Patrick Mours]

Commit: 1ff939f3f7d5cba72fddc5cc0b4a1bcf936bd64d
Author: Patrick Mours
Date:   Mon Aug 26 15:55:39 2019 +0200
Branches: master
https://developer.blender.org/rB1ff939f3f7d5cba72fddc5cc0b4a1bcf936bd64d

Cleanup: avoid unnecessary primitive type lookup and variable initialization

Ref D5363

===================================================================

M	intern/cycles/kernel/kernel_emission.h
M	intern/cycles/kernel/kernel_shader.h

===================================================================

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__