Commit: 4bd642fccb5321ba8d0c6237a4ec4b26b9663ea0
Author: Martijn Berger
Date: Fri May 8 18:03:52 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rB4bd642fccb5321ba8d0c6237a4ec4b26b9663ea0
rename sd_fetch(X) to be ccl_fetch(sd, X)
===================================================================
M intern/cycles/kernel/closure/bsdf.h
M intern/cycles/kernel/geom/geom_attribute.h
M intern/cycles/kernel/geom/geom_motion_triangle.h
M intern/cycles/kernel/geom/geom_object.h
M intern/cycles/kernel/geom/geom_primitive.h
M intern/cycles/kernel/geom/geom_triangle.h
M intern/cycles/kernel/kernel_DirectLighting.cl
M
intern/cycles/kernel/kernel_Holdout_Emission_Blurring_Pathtermination_AO.cl
M intern/cycles/kernel/kernel_camera.h
M intern/cycles/kernel/kernel_emission.h
M intern/cycles/kernel/kernel_passes.h
M intern/cycles/kernel/kernel_path_surface.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_shadow.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/svm/svm.h
M intern/cycles/kernel/svm/svm_attribute.h
M intern/cycles/kernel/svm/svm_camera.h
M intern/cycles/kernel/svm/svm_closure.h
M intern/cycles/kernel/svm/svm_displace.h
M intern/cycles/kernel/svm/svm_fresnel.h
M intern/cycles/kernel/svm/svm_geometry.h
M intern/cycles/kernel/svm/svm_image.h
M intern/cycles/kernel/svm/svm_light_path.h
M intern/cycles/kernel/svm/svm_tex_coord.h
M intern/cycles/kernel/svm/svm_vector_transform.h
M intern/cycles/kernel/svm/svm_wireframe.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf.h
b/intern/cycles/kernel/closure/bsdf.h
index d6dab00..5708044 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -47,79 +47,79 @@ ccl_device int bsdf_sample(KernelGlobals *kg, const
ShaderData *sd, const Shader
switch(sc->type) {
case CLOSURE_BSDF_DIFFUSE_ID:
case CLOSURE_BSDF_BSSRDF_ID:
- label = bsdf_diffuse_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_diffuse_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
#ifdef __SVM__
case CLOSURE_BSDF_OREN_NAYAR_ID:
- label = bsdf_oren_nayar_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_oren_nayar_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
/*case CLOSURE_BSDF_PHONG_RAMP_ID:
- label = bsdf_phong_ramp_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_phong_ramp_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_DIFFUSE_RAMP_ID:
- label = bsdf_diffuse_ramp_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_diffuse_ramp_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;*/
case CLOSURE_BSDF_TRANSLUCENT_ID:
- label = bsdf_translucent_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_translucent_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_REFLECTION_ID:
- label = bsdf_reflection_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_reflection_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_REFRACTION_ID:
- label = bsdf_refraction_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_refraction_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_TRANSPARENT_ID:
- label = bsdf_transparent_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_transparent_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_MICROFACET_GGX_ID:
case CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID:
case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
- label = bsdf_microfacet_ggx_sample(kg, sc,
sd_fetch(Ng), sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_microfacet_ggx_sample(kg, sc,
ccl_fetch(sd,Ng), ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy,
randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
case CLOSURE_BSDF_MICROFACET_BECKMANN_ANISO_ID:
case CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID:
- label = bsdf_microfacet_beckmann_sample(kg, sc,
sd_fetch(Ng), sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_microfacet_beckmann_sample(kg, sc,
ccl_fetch(sd,Ng), ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy,
randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ID:
case CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID:
- label = bsdf_ashikhmin_shirley_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_ashikhmin_shirley_sample(sc,
ccl_fetch(sd,Ng), ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy,
randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
- label = bsdf_ashikhmin_velvet_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_ashikhmin_velvet_sample(sc,
ccl_fetch(sd,Ng), ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy,
randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_DIFFUSE_TOON_ID:
- label = bsdf_diffuse_toon_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_diffuse_toon_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_GLOSSY_TOON_ID:
- label = bsdf_glossy_toon_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_glossy_toon_sample(sc, ccl_fetch(sd,Ng),
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_HAIR_REFLECTION_ID:
- label = bsdf_hair_reflection_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_hair_reflection_sample(sc,
ccl_fetch(sd,Ng), ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy,
randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
case CLOSURE_BSDF_HAIR_TRANSMISSION_ID:
- label = bsdf_hair_transmission_sample(sc, sd_fetch(Ng),
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv,
+ label = bsdf_hair_transmission_sample(sc,
ccl_fetch(sd,Ng), ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy,
randu, randv,
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
#endif
#ifdef __VOLUME__
case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
- label = volume_henyey_greenstein_sample(sc,
sd_fetch(I), sd_fetch(dI).dx, sd_fetch(dI).dy, randu, randv, eval, omega_in,
&domega_in->dx, &domega_in->dy, pdf);
+ label = volume_henyey_greenstein_sample(sc,
ccl_fetch(sd,I), ccl_fetch(sd,dI).dx, ccl_fetch(sd,dI).dy, randu, randv, eval,
omega_in, &domega_in->dx, &domega_in->dy, pdf);
break;
#endif
default:
@@ -139,67 +139,67 @@ ccl_device float3 bsdf_eval(KernelGlobals *kg, const
ShaderData *sd, const Shade
return OSLShader::bsdf_eval(sd, sc, omega_in, *pdf);
#endif
- if(dot(sd_fetch(Ng), omega_in) >= 0.0f) {
+ if(dot(ccl_fetch(sd,Ng), omega_in) >= 0.0f) {
switch(sc->type) {
case CLOSURE_BSDF_DIFFUSE_ID:
case CLOSURE_BSDF_BSSRDF_ID:
- eval = bsdf_diffuse_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_diffuse_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
#ifdef __SVM__
case CLOSURE_BSDF_OREN_NAYAR_ID:
- eval = bsdf_oren_nayar_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_oren_nayar_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
/*case CLOSURE_BSDF_PHONG_RAMP_ID:
- eval = bsdf_phong_ramp_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_phong_ramp_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_DIFFUSE_RAMP_ID:
- eval = bsdf_diffuse_ramp_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_diffuse_ramp_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;*/
case CLOSURE_BSDF_TRANSLUCENT_ID:
- eval = bsdf_translucent_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_translucent_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_REFLECTION_ID:
- eval = bsdf_reflection_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_reflection_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_REFRACTION_ID:
- eval = bsdf_refraction_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_refraction_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_TRANSPARENT_ID:
- eval = bsdf_transparent_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_transparent_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_MICROFACET_GGX_ID:
case CLOSURE_BSDF_MICROFACET_GGX_ANISO_ID:
case CLOSURE_BSDF_MICROFACET_GGX_REFRACTION_ID:
- eval = bsdf_microfacet_ggx_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_microfacet_ggx_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_MICROFACET_BECKMANN_ID:
case CLOSURE_BSDF_MICROFACET_BECKMANN_ANISO_ID:
case CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID:
- eval =
bsdf_microfacet_beckmann_eval_reflect(sc, sd_fetch(I), omega_in, pdf);
+ eval =
bsdf_microfacet_beckmann_eval_reflect(sc, ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ID:
case CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID:
- eval = bsdf_ashikhmin_shirley_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_ashikhmin_shirley_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
- eval = bsdf_ashikhmin_velvet_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_ashikhmin_velvet_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_DIFFUSE_TOON_ID:
- eval = bsdf_diffuse_toon_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_diffuse_toon_eval_reflect(sc,
ccl_fetch(sd,I), omega_in, pdf);
break;
case CLOSURE_BSDF_GLOSSY_TOON_ID:
- eval = bsdf_glossy_toon_eval_reflect(sc,
sd_fetch(I), omega_in, pdf);
+ eval = bsdf_gloss
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
