Commit: 329eeacc66d13c9007e22f200304ebe902737abb Author: Lukas Stockner Date: Mon Feb 6 02:01:17 2023 +0100 Branches: master https://developer.blender.org/rB329eeacc66d13c9007e22f200304ebe902737abb
Cleanup: Cycles: Remove isotropic microfacet closure setup functions Turns out these are 100% redundant, so get rid of them. =================================================================== M intern/cycles/kernel/closure/bsdf_microfacet.h M intern/cycles/kernel/osl/closures_setup.h =================================================================== diff --git a/intern/cycles/kernel/closure/bsdf_microfacet.h b/intern/cycles/kernel/closure/bsdf_microfacet.h index f16c753d9e2..d7c3d3651fc 100644 --- a/intern/cycles/kernel/closure/bsdf_microfacet.h +++ b/intern/cycles/kernel/closure/bsdf_microfacet.h @@ -519,14 +519,6 @@ ccl_device int bsdf_microfacet_ggx_setup(ccl_private MicrofacetBsdf *bsdf) return SD_BSDF | SD_BSDF_HAS_EVAL; } -/* Required to maintain OSL interface. */ -ccl_device int bsdf_microfacet_ggx_isotropic_setup(ccl_private MicrofacetBsdf *bsdf) -{ - bsdf->alpha_y = bsdf->alpha_x; - - return bsdf_microfacet_ggx_setup(bsdf); -} - ccl_device int bsdf_microfacet_ggx_fresnel_setup(ccl_private MicrofacetBsdf *bsdf, ccl_private const ShaderData *sd) { @@ -613,14 +605,6 @@ ccl_device int bsdf_microfacet_beckmann_setup(ccl_private MicrofacetBsdf *bsdf) return SD_BSDF | SD_BSDF_HAS_EVAL; } -/* Required to maintain OSL interface. */ -ccl_device int bsdf_microfacet_beckmann_isotropic_setup(ccl_private MicrofacetBsdf *bsdf) -{ - bsdf->alpha_y = bsdf->alpha_x; - - return bsdf_microfacet_beckmann_setup(bsdf); -} - ccl_device int bsdf_microfacet_beckmann_refraction_setup(ccl_private MicrofacetBsdf *bsdf) { bsdf->alpha_x = saturatef(bsdf->alpha_x); diff --git a/intern/cycles/kernel/osl/closures_setup.h b/intern/cycles/kernel/osl/closures_setup.h index aa44132da5e..5ea8f080410 100644 --- a/intern/cycles/kernel/osl/closures_setup.h +++ b/intern/cycles/kernel/osl/closures_setup.h @@ -209,14 +209,7 @@ ccl_device void osl_closure_microfacet_setup(KernelGlobals kg, if (closure->distribution == make_string("ggx", 11253504724482777663ull) || closure->distribution == make_string("default", 4430693559278735917ull)) { if (!closure->refract) { - if (closure->alpha_x == closure->alpha_y) { - /* Isotropic */ - sd->flag |= bsdf_microfacet_ggx_isotropic_setup(bsdf); - } - else { - /* Anisotropic */ - sd->flag |= bsdf_microfacet_ggx_setup(bsdf); - } + sd->flag |= bsdf_microfacet_ggx_setup(bsdf); } else { sd->flag |= bsdf_microfacet_ggx_refraction_setup(bsdf); @@ -225,14 +218,7 @@ ccl_device void osl_closure_microfacet_setup(KernelGlobals kg, /* Beckmann */ else { if (!closure->refract) { - if (closure->alpha_x == closure->alpha_y) { - /* Isotropic */ - sd->flag |= bsdf_microfacet_beckmann_isotropic_setup(bsdf); - } - else { - /* Anisotropic */ - sd->flag |= bsdf_microfacet_beckmann_setup(bsdf); - } + sd->flag |= bsdf_microfacet_beckmann_setup(bsdf); } else { sd->flag |= bsdf_microfacet_beckmann_refraction_setup(bsdf); @@ -258,9 +244,9 @@ ccl_device void osl_closure_microfacet_ggx_setup( } bsdf->N = ensure_valid_reflection(sd->Ng, sd->wi, closure->N); - bsdf->alpha_x = closure->alpha_x; + bsdf->alpha_x = bsdf->alpha_y = closure->alpha_x; - sd->flag |= bsdf_microfacet_ggx_isotropic_setup(bsdf); + sd->flag |= bsdf_microfacet_ggx_setup(bsdf); } ccl_device void osl_closure_microfacet_ggx_aniso_setup( @@ -652,9 +638,9 @@ ccl_device void osl_closure_microfacet_beckmann_setup( } bsdf->N = ensure_valid_reflection(sd->Ng, sd->wi, closure->N); - bsdf->alpha_x = closure->alpha_x; + bsdf->alpha_x = bsdf->alpha_y = closure->alpha_x; - sd->flag |= bsdf_microfacet_beckmann_isotropic_setup(bsdf); + sd->flag |= bsdf_microfacet_beckmann_setup(bsdf); } ccl_device void osl_closure_microfacet_beckmann_aniso_setup( _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs