diff options
author | Thomas Dinges <blender@dingto.org> | 2015-02-17 15:43:12 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2015-02-17 15:44:25 +0300 |
commit | bf878d3c3d39b0f460add02514f5a32dc8169613 (patch) | |
tree | 30e8ea698ade339af9fabcfe2d2f71ffe1ab7192 /intern | |
parent | 4660c00ac57effeb9598bb3083900dc354a4f43f (diff) |
Cycles: Remove empty closure blur code and the corresponding entries in the switch.
Most compilers will probably optimize that out, but I still don't see a reason to keep it.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/kernel/closure/bsdf.h | 45 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_diffuse.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_hair.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_oren_nayar.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_reflection.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_refraction.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_toon.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_transparent.h | 4 |
9 files changed, 4 insertions, 85 deletions
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h index 56cd52f69e6..2b9e2a4e44d 100644 --- a/intern/cycles/kernel/closure/bsdf.h +++ b/intern/cycles/kernel/closure/bsdf.h @@ -275,6 +275,8 @@ ccl_device float3 bsdf_eval(KernelGlobals *kg, const ShaderData *sd, const Shade ccl_device void bsdf_blur(KernelGlobals *kg, ShaderClosure *sc, float roughness) { +/* ToDo: do we want to blur volume closures? */ + #ifdef __OSL__ if(kg->osl && sc->prim) { OSLShader::bsdf_blur(sc, roughness); @@ -282,33 +284,8 @@ ccl_device void bsdf_blur(KernelGlobals *kg, ShaderClosure *sc, float roughness) } #endif - switch(sc->type) { - case CLOSURE_BSDF_DIFFUSE_ID: - case CLOSURE_BSDF_BSSRDF_ID: - bsdf_diffuse_blur(sc, roughness); - break; #ifdef __SVM__ - case CLOSURE_BSDF_OREN_NAYAR_ID: - bsdf_oren_nayar_blur(sc, roughness); - break; - /*case CLOSURE_BSDF_PHONG_RAMP_ID: - bsdf_phong_ramp_blur(sc, roughness); - break; - case CLOSURE_BSDF_DIFFUSE_RAMP_ID: - bsdf_diffuse_ramp_blur(sc, roughness); - break;*/ - case CLOSURE_BSDF_TRANSLUCENT_ID: - bsdf_translucent_blur(sc, roughness); - break; - case CLOSURE_BSDF_REFLECTION_ID: - bsdf_reflection_blur(sc, roughness); - break; - case CLOSURE_BSDF_REFRACTION_ID: - bsdf_refraction_blur(sc, roughness); - break; - case CLOSURE_BSDF_TRANSPARENT_ID: - bsdf_transparent_blur(sc, roughness); - break; + switch(sc->type) { case CLOSURE_BSDF_MICROFACET_GGX_ID: case CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID: case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID: @@ -323,24 +300,10 @@ ccl_device void bsdf_blur(KernelGlobals *kg, ShaderClosure *sc, float roughness) case CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID: bsdf_ashikhmin_shirley_blur(sc, roughness); break; - case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID: - bsdf_ashikhmin_velvet_blur(sc, roughness); - break; - case CLOSURE_BSDF_DIFFUSE_TOON_ID: - bsdf_diffuse_toon_blur(sc, roughness); - break; - case CLOSURE_BSDF_GLOSSY_TOON_ID: - bsdf_glossy_toon_blur(sc, roughness); - break; - case CLOSURE_BSDF_HAIR_REFLECTION_ID: - case CLOSURE_BSDF_HAIR_TRANSMISSION_ID: - bsdf_hair_reflection_blur(sc, roughness); - break; -#endif - /* todo: do we want to blur volume closures? */ default: break; } +#endif } CCL_NAMESPACE_END diff --git a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h index 3631f90bf8c..580f50d5dd6 100644 --- a/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h +++ b/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h @@ -45,10 +45,6 @@ ccl_device int bsdf_ashikhmin_velvet_setup(ShaderClosure *sc) return SD_BSDF|SD_BSDF_HAS_EVAL; } -ccl_device void bsdf_ashikhmin_velvet_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_ashikhmin_velvet_eval_reflect(const ShaderClosure *sc, const float3 I, const float3 omega_in, float *pdf) { float m_invsigma2 = sc->data0; diff --git a/intern/cycles/kernel/closure/bsdf_diffuse.h b/intern/cycles/kernel/closure/bsdf_diffuse.h index 371f467000c..4b29bb096d1 100644 --- a/intern/cycles/kernel/closure/bsdf_diffuse.h +++ b/intern/cycles/kernel/closure/bsdf_diffuse.h @@ -43,10 +43,6 @@ ccl_device int bsdf_diffuse_setup(ShaderClosure *sc) return SD_BSDF|SD_BSDF_HAS_EVAL; } -ccl_device void bsdf_diffuse_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_diffuse_eval_reflect(const ShaderClosure *sc, const float3 I, const float3 omega_in, float *pdf) { float3 N = sc->N; @@ -90,10 +86,6 @@ ccl_device int bsdf_translucent_setup(ShaderClosure *sc) return SD_BSDF|SD_BSDF_HAS_EVAL; } -ccl_device void bsdf_translucent_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_translucent_eval_reflect(const ShaderClosure *sc, const float3 I, const float3 omega_in, float *pdf) { return make_float3(0.0f, 0.0f, 0.0f); diff --git a/intern/cycles/kernel/closure/bsdf_hair.h b/intern/cycles/kernel/closure/bsdf_hair.h index 8ef95435e72..f26ede0381d 100644 --- a/intern/cycles/kernel/closure/bsdf_hair.h +++ b/intern/cycles/kernel/closure/bsdf_hair.h @@ -36,14 +36,6 @@ CCL_NAMESPACE_BEGIN -ccl_device void bsdf_hair_reflection_blur(ShaderClosure *sc, float roughness) -{ -} - -ccl_device void bsdf_hair_transmission_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device int bsdf_hair_reflection_setup(ShaderClosure *sc) { sc->type = CLOSURE_BSDF_HAIR_REFLECTION_ID; diff --git a/intern/cycles/kernel/closure/bsdf_oren_nayar.h b/intern/cycles/kernel/closure/bsdf_oren_nayar.h index d18c3dd6142..c476d4ca4e2 100644 --- a/intern/cycles/kernel/closure/bsdf_oren_nayar.h +++ b/intern/cycles/kernel/closure/bsdf_oren_nayar.h @@ -47,10 +47,6 @@ ccl_device int bsdf_oren_nayar_setup(ShaderClosure *sc) return SD_BSDF|SD_BSDF_HAS_EVAL; } -ccl_device void bsdf_oren_nayar_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_oren_nayar_eval_reflect(const ShaderClosure *sc, const float3 I, const float3 omega_in, float *pdf) { if(dot(sc->N, omega_in) > 0.0f) { diff --git a/intern/cycles/kernel/closure/bsdf_reflection.h b/intern/cycles/kernel/closure/bsdf_reflection.h index 6b90236525d..303f4c9ce34 100644 --- a/intern/cycles/kernel/closure/bsdf_reflection.h +++ b/intern/cycles/kernel/closure/bsdf_reflection.h @@ -43,10 +43,6 @@ ccl_device int bsdf_reflection_setup(ShaderClosure *sc) return SD_BSDF; } -ccl_device void bsdf_reflection_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_reflection_eval_reflect(const ShaderClosure *sc, const float3 I, const float3 omega_in, float *pdf) { return make_float3(0.0f, 0.0f, 0.0f); diff --git a/intern/cycles/kernel/closure/bsdf_refraction.h b/intern/cycles/kernel/closure/bsdf_refraction.h index 02a06941afa..c78a4b67134 100644 --- a/intern/cycles/kernel/closure/bsdf_refraction.h +++ b/intern/cycles/kernel/closure/bsdf_refraction.h @@ -43,10 +43,6 @@ ccl_device int bsdf_refraction_setup(ShaderClosure *sc) return SD_BSDF; } -ccl_device void bsdf_refraction_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_refraction_eval_reflect(const ShaderClosure *sc, const float3 I, const float3 omega_in, float *pdf) { return make_float3(0.0f, 0.0f, 0.0f); diff --git a/intern/cycles/kernel/closure/bsdf_toon.h b/intern/cycles/kernel/closure/bsdf_toon.h index 797fa4227ae..df03942638f 100644 --- a/intern/cycles/kernel/closure/bsdf_toon.h +++ b/intern/cycles/kernel/closure/bsdf_toon.h @@ -46,10 +46,6 @@ ccl_device int bsdf_diffuse_toon_setup(ShaderClosure *sc) return SD_BSDF|SD_BSDF_HAS_EVAL; } -ccl_device void bsdf_diffuse_toon_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_toon_get_intensity(float max_angle, float smooth, float angle) { float is; @@ -130,10 +126,6 @@ ccl_device int bsdf_glossy_toon_setup(ShaderClosure *sc) return SD_BSDF|SD_BSDF_HAS_EVAL; } -ccl_device void bsdf_glossy_toon_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_glossy_toon_eval_reflect(const ShaderClosure *sc, const float3 I, const float3 omega_in, float *pdf) { float max_angle = sc->data0*M_PI_2_F; diff --git a/intern/cycles/kernel/closure/bsdf_transparent.h b/intern/cycles/kernel/closure/bsdf_transparent.h index 73601d20c3a..3c2fd8004df 100644 --- a/intern/cycles/kernel/closure/bsdf_transparent.h +++ b/intern/cycles/kernel/closure/bsdf_transparent.h @@ -41,10 +41,6 @@ ccl_device int bsdf_transparent_setup(ShaderClosure *sc) return SD_BSDF|SD_TRANSPARENT; } -ccl_device void bsdf_transparent_blur(ShaderClosure *sc, float roughness) -{ -} - ccl_device float3 bsdf_transparent_eval_reflect(const ShaderClosure *sc, const float3 I, const float3 omega_in, float *pdf) { return make_float3(0.0f, 0.0f, 0.0f); |