From 9781139590dbbeb6d246d4fbafa8ab1a4696c7fb Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 21 Apr 2017 12:56:54 +0200 Subject: Cycles: Solve speed regression of classroom scene after principled commit This way we can skip it from compiling into OpenCL kernels by making this shader compile-time feature. --- intern/cycles/kernel/kernel_subsurface.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'intern/cycles/kernel/kernel_subsurface.h') diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h index fb4a054dcd0..f58eef7a368 100644 --- a/intern/cycles/kernel/kernel_subsurface.h +++ b/intern/cycles/kernel/kernel_subsurface.h @@ -149,6 +149,7 @@ ccl_device void subsurface_scatter_setup_diffuse_bsdf(ShaderData *sd, ShaderClos if(hit) { Bssrdf *bssrdf = (Bssrdf *)sc; +#ifdef __PRINCIPLED__ if(bssrdf->type == CLOSURE_BSSRDF_PRINCIPLED_ID) { PrincipledDiffuseBsdf *bsdf = (PrincipledDiffuseBsdf*)bsdf_alloc(sd, sizeof(PrincipledDiffuseBsdf), weight); @@ -164,6 +165,7 @@ ccl_device void subsurface_scatter_setup_diffuse_bsdf(ShaderData *sd, ShaderClos } else if(CLOSURE_IS_BSDF_BSSRDF(bssrdf->type) || CLOSURE_IS_BSSRDF(bssrdf->type)) +#endif /* __PRINCIPLED__ */ { DiffuseBsdf *bsdf = (DiffuseBsdf*)bsdf_alloc(sd, sizeof(DiffuseBsdf), weight); -- cgit v1.2.3