[Bf-blender-cvs] [adacd20abad] soc-2018-hair-shader: Remove last remnants of debugging code

[L. E. Segovia]

Commit: adacd20abad3996ac5deb9e9a6b52fe244011853
Author: L. E. Segovia
Date:   Mon May 21 17:24:24 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rBadacd20abad3996ac5deb9e9a6b52fe244011853

Remove last remnants of debugging code

Ref T54796

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

M	intern/cycles/kernel/closure/bsdf.h
M	intern/cycles/kernel/svm/svm_closure.h

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

diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h
index 3a5edb8ce90..7c17a695785 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -83,8 +83,6 @@ ccl_device_forceinline int bsdf_sample(KernelGlobals *kg,
 									   float *pdf)
 {
 	int label;
-    
-    printf("sample: %i\n", sc->type);
 
 	switch(sc->type) {
 		case CLOSURE_BSDF_DIFFUSE_ID:
@@ -224,8 +222,6 @@ float3 bsdf_eval(KernelGlobals *kg,
 				 float *pdf)
 {
 	float3 eval;
-    
-    printf("eval: %i\n", sc->type);
 
 	if(dot(sd->Ng, omega_in) >= 0.0f) {
 		switch(sc->type) {
@@ -292,7 +288,6 @@ float3 bsdf_eval(KernelGlobals *kg,
 				eval = bsdf_glossy_toon_eval_reflect(sc, sd->I, omega_in, pdf);
 				break;
 			case CLOSURE_BSDF_HAIR_PRINCIPLED_ID:
-                printf("eval'ing hair \n");
 				eval = bsdf_principled_hair_eval(sd, sc, omega_in, pdf);
 				break;
 			case CLOSURE_BSDF_HAIR_REFLECTION_ID:
@@ -378,7 +373,6 @@ float3 bsdf_eval(KernelGlobals *kg,
 				eval = bsdf_glossy_toon_eval_transmit(sc, sd->I, omega_in, pdf);
 				break;
 			case CLOSURE_BSDF_HAIR_PRINCIPLED_ID:
-                printf("eval'ing hair 2\n");
 				eval = bsdf_principled_hair_eval(sd, sc, omega_in, pdf);
 				break;
 			case CLOSURE_BSDF_HAIR_REFLECTION_ID:
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index c4aa6e349c9..73b24a8785d 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -721,49 +721,48 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 			}
 			break;
 		}
-        case CLOSURE_BSDF_HAIR_PRINCIPLED_ID: {
-            printf("Creating PrincipledHair closure \n");
-            float3 weight = sd->svm_closure_weight * mix_weight;
-
-            uint offset_ofs, ior_ofs, color_ofs, parametrization;
-            decode_node_uchar4(data_node.y, &offset_ofs, &ior_ofs, &color_ofs, &parametrization);
-
-            float alpha = (stack_valid(offset_ofs))? stack_load_float(stack, offset_ofs): __uint_as_float(data_node.z);
-            float ior = (stack_valid(ior_ofs))? stack_load_float(stack, ior_ofs): __uint_as_float(data_node.w);
-
-            PrincipledHairBSDF *bsdf = (PrincipledHairBSDF*)bsdf_alloc(sd, sizeof(PrincipledHairBSDF), weight);
-            if(bsdf) {
-                bsdf->N = N;
-                bsdf->v = param1;
-                bsdf->s = param2;
-                bsdf->alpha = alpha;
-                bsdf->eta = ior;
-
-                float3 color = stack_load_float3(stack, color_ofs);
-                switch(parametrization) {
-                    case NODE_PRINCIPLED_HAIR_DIRECT_ABSORPTION:
-                        bsdf->sigma = color;
-                        break;
-                    case NODE_PRINCIPLED_HAIR_PHYSICAL:
-                        bsdf->sigma = -log3(max(color, make_float3(1e-5f, 1e-5f, 1e-5f)));
-                        break;
-                    case NODE_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION:
-                        bsdf->sigma = color.x*make_float3(0.419f, 0.697f, 1.37f) + color.y*make_float3(0.187f, 0.4f, 1.05f);
-                        break;
-                    default:
-                        kernel_assert(!"Invalid Principled Hair parametrization!");
-                        //fallthrough
-                    case NODE_PRINCIPLED_HAIR_REFLECTANCE:
-                        float roughness_fac = (((((0.245f*param2) + 5.574f)*param2 - 10.73f)*param2 + 2.532f)*param2 - 0.215f)*param2 + 5.969f;
-                        bsdf->sigma = log3(color)/roughness_fac;
-                        bsdf->sigma *= bsdf->sigma;
-                        break;
-                }
-
-                sd->flag |= bsdf_principled_hair_setup(kg, sd, bsdf);
-            }
-            break;
-        }
+		case CLOSURE_BSDF_HAIR_PRINCIPLED_ID: {
+			float3 weight = sd->svm_closure_weight * mix_weight;
+
+			uint offset_ofs, ior_ofs, color_ofs, parametrization;
+			decode_node_uchar4(data_node.y, &offset_ofs, &ior_ofs, &color_ofs, &parametrization);
+
+			float alpha = (stack_valid(offset_ofs))? stack_load_float(stack, offset_ofs): __uint_as_float(data_node.z);
+			float ior = (stack_valid(ior_ofs))? stack_load_float(stack, ior_ofs): __uint_as_float(data_node.w);
+
+			PrincipledHairBSDF *bsdf = (PrincipledHairBSDF*)bsdf_alloc(sd, sizeof(PrincipledHairBSDF), weight);
+			if(bsdf) {
+				bsdf->N = N;
+				bsdf->v = param1;
+				bsdf->s = param2;
+				bsdf->alpha = alpha;
+				bsdf->eta = ior;
+
+				float3 color = stack_load_float3(stack, color_ofs);
+				switch(parametrization) {
+					case NODE_PRINCIPLED_HAIR_DIRECT_ABSORPTION:
+						bsdf->sigma = color;
+						break;
+					case NODE_PRINCIPLED_HAIR_PHYSICAL:
+						bsdf->sigma = -log3(max(color, make_float3(1e-5f, 1e-5f, 1e-5f)));
+						break;
+					case NODE_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION:
+						bsdf->sigma = color.x*make_float3(0.419f, 0.697f, 1.37f) + color.y*make_float3(0.187f, 0.4f, 1.05f);
+						break;
+					default:
+						kernel_assert(!"Invalid Principled Hair parametrization!");
+						//fallthrough
+					case NODE_PRINCIPLED_HAIR_REFLECTANCE:
+						float roughness_fac = (((((0.245f*param2) + 5.574f)*param2 - 10.73f)*param2 + 2.532f)*param2 - 0.215f)*param2 + 5.969f;
+						bsdf->sigma = log3(color)/roughness_fac;
+						bsdf->sigma *= bsdf->sigma;
+						break;
+				}
+
+				sd->flag |= bsdf_principled_hair_setup(kg, sd, bsdf);
+			}
+			break;
+		}
 #ifdef __HAIR__
 		case CLOSURE_BSDF_HAIR_REFLECTION_ID:
 		case CLOSURE_BSDF_HAIR_TRANSMISSION_ID: {