Blender Git Loki
Git Commits -> Revision 615fe02
Revision 615fe02 by Brecht Van Lommel (master) November 3, 2012, 14:32 (GMT) |
Cycles OSL: refactoring and fixes * Moved kernel/osl/nodes to kernel/shaders * Renamed standard attributes to use geom:, particle:, object: prefixes * Update stdosl.h to properly reflect the closures we support * Fix the wrong stdosl.h being used for building shaders * Add geom:numpolyvertices, geom:trianglevertices, geom:polyvertices attributes |
Commit Details:
Full Hash: 615fe0295fe13c229d7376b02a50ac110b636c47
SVN Revision: 51836
Parent Commit: 6b098d7
Lines Changed: +4216, -4243
63 Added Paths:
/intern/cycles/kernel/shaders/CMakeLists.txt (+98, -0) (View)
/intern/cycles/kernel/shaders/node_add_closure.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_attribute.osl (+43, -0) (View)
/intern/cycles/kernel/shaders/node_background.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_brick_texture.osl (+93, -0) (View)
/intern/cycles/kernel/shaders/node_brightness.osl (+51, -0) (View)
/intern/cycles/kernel/shaders/node_bump.osl (+49, -0) (View)
/intern/cycles/kernel/shaders/node_camera.osl (+33, -0) (View)
/intern/cycles/kernel/shaders/node_checker_texture.osl (+58, -0) (View)
/intern/cycles/kernel/shaders/node_color.h (+125, -0) (View)
/intern/cycles/kernel/shaders/node_combine_rgb.osl (+29, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_color.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_float.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_int.osl (+36, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_normal.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_point.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_vector.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl (+32, -0) (View)
/intern/cycles/kernel/shaders/node_emission.osl (+32, -0) (View)
/intern/cycles/kernel/shaders/node_environment_texture.osl (+34, -0) (View)
/intern/cycles/kernel/shaders/node_fresnel.h (+36, -0) (View)
/intern/cycles/kernel/shaders/node_fresnel.osl (+31, -0) (View)
/intern/cycles/kernel/shaders/node_gamma.osl (+27, -0) (View)
/intern/cycles/kernel/shaders/node_geometry.osl (+50, -0) (View)
/intern/cycles/kernel/shaders/node_glass_bsdf.osl (+43, -0) (View)
/intern/cycles/kernel/shaders/node_glossy_bsdf.osl (+37, -0) (View)
/intern/cycles/kernel/shaders/node_gradient_texture.osl (+74, -0) (View)
/intern/cycles/kernel/shaders/node_holdout.osl (+26, -0) (View)
/intern/cycles/kernel/shaders/node_hsv.osl (+43, -0) (View)
/intern/cycles/kernel/shaders/node_image_texture.osl (+120, -0) (View)
/intern/cycles/kernel/shaders/node_invert.osl (+29, -0) (View)
/intern/cycles/kernel/shaders/node_layer_weight.osl (+46, -0) (View)
/intern/cycles/kernel/shaders/node_light_falloff.osl (+46, -0) (View)
/intern/cycles/kernel/shaders/node_light_path.osl (+41, -0) (View)
/intern/cycles/kernel/shaders/node_magic_texture.osl (+104, -0) (View)
/intern/cycles/kernel/shaders/node_mapping.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_math.osl (+88, -0) (View)
/intern/cycles/kernel/shaders/node_mix.osl (+331, -0) (View)
/intern/cycles/kernel/shaders/node_mix_closure.osl (+30, -0) (View)
/intern/cycles/kernel/shaders/node_musgrave_texture.osl (+222, -0) (View)
/intern/cycles/kernel/shaders/node_noise_texture.osl (+56, -0) (View)
/intern/cycles/kernel/shaders/node_normal.osl (+30, -0) (View)
/intern/cycles/kernel/shaders/node_object_info.osl (+32, -0) (View)
/intern/cycles/kernel/shaders/node_output_displacement.osl (+25, -0) (View)
/intern/cycles/kernel/shaders/node_output_surface.osl (+25, -0) (View)
/intern/cycles/kernel/shaders/node_output_volume.osl (+25, -0) (View)
/intern/cycles/kernel/shaders/node_particle_info.osl (+38, -0) (View)
/intern/cycles/kernel/shaders/node_rgb_ramp.osl (+43, -0) (View)
/intern/cycles/kernel/shaders/node_separate_rgb.osl (+30, -0) (View)
/intern/cycles/kernel/shaders/node_set_normal.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_sky_texture.osl (+162, -0) (View)
/intern/cycles/kernel/shaders/node_texture.h (+270, -0) (View)
/intern/cycles/kernel/shaders/node_texture_coordinate.osl (+81, -0) (View)
/intern/cycles/kernel/shaders/node_translucent_bsdf.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_transparent_bsdf.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_value.osl (+33, -0) (View)
/intern/cycles/kernel/shaders/node_vector_math.osl (+53, -0) (View)
/intern/cycles/kernel/shaders/node_velvet_bsdf.osl (+32, -0) (View)
/intern/cycles/kernel/shaders/node_voronoi_texture.osl (+48, -0) (View)
/intern/cycles/kernel/shaders/node_ward_bsdf.osl (+30, -0) (View)
/intern/cycles/kernel/shaders/node_wave_texture.osl (+61, -0) (View)
/intern/cycles/kernel/shaders/oslutil.h (+94, -0) (View)
/intern/cycles/kernel/shaders/stdosl.h (+474, -0) (View)
/intern/cycles/kernel/shaders/node_add_closure.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_attribute.osl (+43, -0) (View)
/intern/cycles/kernel/shaders/node_background.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_brick_texture.osl (+93, -0) (View)
/intern/cycles/kernel/shaders/node_brightness.osl (+51, -0) (View)
/intern/cycles/kernel/shaders/node_bump.osl (+49, -0) (View)
/intern/cycles/kernel/shaders/node_camera.osl (+33, -0) (View)
/intern/cycles/kernel/shaders/node_checker_texture.osl (+58, -0) (View)
/intern/cycles/kernel/shaders/node_color.h (+125, -0) (View)
/intern/cycles/kernel/shaders/node_combine_rgb.osl (+29, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_color.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_float.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_int.osl (+36, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_normal.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_point.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_convert_from_vector.osl (+35, -0) (View)
/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl (+32, -0) (View)
/intern/cycles/kernel/shaders/node_emission.osl (+32, -0) (View)
/intern/cycles/kernel/shaders/node_environment_texture.osl (+34, -0) (View)
/intern/cycles/kernel/shaders/node_fresnel.h (+36, -0) (View)
/intern/cycles/kernel/shaders/node_fresnel.osl (+31, -0) (View)
/intern/cycles/kernel/shaders/node_gamma.osl (+27, -0) (View)
/intern/cycles/kernel/shaders/node_geometry.osl (+50, -0) (View)
/intern/cycles/kernel/shaders/node_glass_bsdf.osl (+43, -0) (View)
/intern/cycles/kernel/shaders/node_glossy_bsdf.osl (+37, -0) (View)
/intern/cycles/kernel/shaders/node_gradient_texture.osl (+74, -0) (View)
/intern/cycles/kernel/shaders/node_holdout.osl (+26, -0) (View)
/intern/cycles/kernel/shaders/node_hsv.osl (+43, -0) (View)
/intern/cycles/kernel/shaders/node_image_texture.osl (+120, -0) (View)
/intern/cycles/kernel/shaders/node_invert.osl (+29, -0) (View)
/intern/cycles/kernel/shaders/node_layer_weight.osl (+46, -0) (View)
/intern/cycles/kernel/shaders/node_light_falloff.osl (+46, -0) (View)
/intern/cycles/kernel/shaders/node_light_path.osl (+41, -0) (View)
/intern/cycles/kernel/shaders/node_magic_texture.osl (+104, -0) (View)
/intern/cycles/kernel/shaders/node_mapping.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_math.osl (+88, -0) (View)
/intern/cycles/kernel/shaders/node_mix.osl (+331, -0) (View)
/intern/cycles/kernel/shaders/node_mix_closure.osl (+30, -0) (View)
/intern/cycles/kernel/shaders/node_musgrave_texture.osl (+222, -0) (View)
/intern/cycles/kernel/shaders/node_noise_texture.osl (+56, -0) (View)
/intern/cycles/kernel/shaders/node_normal.osl (+30, -0) (View)
/intern/cycles/kernel/shaders/node_object_info.osl (+32, -0) (View)
/intern/cycles/kernel/shaders/node_output_displacement.osl (+25, -0) (View)
/intern/cycles/kernel/shaders/node_output_surface.osl (+25, -0) (View)
/intern/cycles/kernel/shaders/node_output_volume.osl (+25, -0) (View)
/intern/cycles/kernel/shaders/node_particle_info.osl (+38, -0) (View)
/intern/cycles/kernel/shaders/node_rgb_ramp.osl (+43, -0) (View)
/intern/cycles/kernel/shaders/node_separate_rgb.osl (+30, -0) (View)
/intern/cycles/kernel/shaders/node_set_normal.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_sky_texture.osl (+162, -0) (View)
/intern/cycles/kernel/shaders/node_texture.h (+270, -0) (View)
/intern/cycles/kernel/shaders/node_texture_coordinate.osl (+81, -0) (View)
/intern/cycles/kernel/shaders/node_translucent_bsdf.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_transparent_bsdf.osl (+28, -0) (View)
/intern/cycles/kernel/shaders/node_value.osl (+33, -0) (View)
/intern/cycles/kernel/shaders/node_vector_math.osl (+53, -0) (View)
/intern/cycles/kernel/shaders/node_velvet_bsdf.osl (+32, -0) (View)
/intern/cycles/kernel/shaders/node_voronoi_texture.osl (+48, -0) (View)
/intern/cycles/kernel/shaders/node_ward_bsdf.osl (+30, -0) (View)
/intern/cycles/kernel/shaders/node_wave_texture.osl (+61, -0) (View)
/intern/cycles/kernel/shaders/oslutil.h (+94, -0) (View)
/intern/cycles/kernel/shaders/stdosl.h (+474, -0) (View)
63 Deleted Paths:
/intern/cycles/kernel/osl/nodes/CMakeLists.txt (+0, -96)
/intern/cycles/kernel/osl/nodes/node_add_closure.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_attribute.osl (+0, -43)
/intern/cycles/kernel/osl/nodes/node_background.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_brick_texture.osl (+0, -93)
/intern/cycles/kernel/osl/nodes/node_brightness.osl (+0, -51)
/intern/cycles/kernel/osl/nodes/node_bump.osl (+0, -49)
/intern/cycles/kernel/osl/nodes/node_camera.osl (+0, -33)
/intern/cycles/kernel/osl/nodes/node_checker_texture.osl (+0, -58)
/intern/cycles/kernel/osl/nodes/node_color.h (+0, -125)
/intern/cycles/kernel/osl/nodes/node_combine_rgb.osl (+0, -29)
/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_convert_from_int.osl (+0, -36)
/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl (+0, -32)
/intern/cycles/kernel/osl/nodes/node_emission.osl (+0, -32)
/intern/cycles/kernel/osl/nodes/node_environment_texture.osl (+0, -34)
/intern/cycles/kernel/osl/nodes/node_fresnel.h (+0, -36)
/intern/cycles/kernel/osl/nodes/node_fresnel.osl (+0, -31)
/intern/cycles/kernel/osl/nodes/node_gamma.osl (+0, -27)
/intern/cycles/kernel/osl/nodes/node_geometry.osl (+0, -50)
/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl (+0, -43)
/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl (+0, -37)
/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl (+0, -74)
/intern/cycles/kernel/osl/nodes/node_holdout.osl (+0, -26)
/intern/cycles/kernel/osl/nodes/node_hsv.osl (+0, -43)
/intern/cycles/kernel/osl/nodes/node_image_texture.osl (+0, -120)
/intern/cycles/kernel/osl/nodes/node_invert.osl (+0, -29)
/intern/cycles/kernel/osl/nodes/node_layer_weight.osl (+0, -46)
/intern/cycles/kernel/osl/nodes/node_light_falloff.osl (+0, -46)
/intern/cycles/kernel/osl/nodes/node_light_path.osl (+0, -41)
/intern/cycles/kernel/osl/nodes/node_magic_texture.osl (+0, -104)
/intern/cycles/kernel/osl/nodes/node_mapping.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_math.osl (+0, -88)
/intern/cycles/kernel/osl/nodes/node_mix.osl (+0, -331)
/intern/cycles/kernel/osl/nodes/node_mix_closure.osl (+0, -30)
/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl (+0, -222)
/intern/cycles/kernel/osl/nodes/node_noise_texture.osl (+0, -56)
/intern/cycles/kernel/osl/nodes/node_normal.osl (+0, -30)
/intern/cycles/kernel/osl/nodes/node_object_info.osl (+0, -32)
/intern/cycles/kernel/osl/nodes/node_output_displacement.osl (+0, -25)
/intern/cycles/kernel/osl/nodes/node_output_surface.osl (+0, -25)
/intern/cycles/kernel/osl/nodes/node_output_volume.osl (+0, -25)
/intern/cycles/kernel/osl/nodes/node_particle_info.osl (+0, -38)
/intern/cycles/kernel/osl/nodes/node_rgb_ramp.osl (+0, -43)
/intern/cycles/kernel/osl/nodes/node_separate_rgb.osl (+0, -30)
/intern/cycles/kernel/osl/nodes/node_set_normal.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_sky_texture.osl (+0, -162)
/intern/cycles/kernel/osl/nodes/node_texture.h (+0, -270)
/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl (+0, -81)
/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_value.osl (+0, -33)
/intern/cycles/kernel/osl/nodes/node_vector_math.osl (+0, -53)
/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl (+0, -32)
/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl (+0, -48)
/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl (+0, -30)
/intern/cycles/kernel/osl/nodes/node_wave_texture.osl (+0, -61)
/intern/cycles/kernel/osl/nodes/oslutil.h (+0, -94)
/intern/cycles/kernel/osl/nodes/stdosl.h (+0, -537)
/intern/cycles/kernel/osl/nodes/node_add_closure.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_attribute.osl (+0, -43)
/intern/cycles/kernel/osl/nodes/node_background.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_brick_texture.osl (+0, -93)
/intern/cycles/kernel/osl/nodes/node_brightness.osl (+0, -51)
/intern/cycles/kernel/osl/nodes/node_bump.osl (+0, -49)
/intern/cycles/kernel/osl/nodes/node_camera.osl (+0, -33)
/intern/cycles/kernel/osl/nodes/node_checker_texture.osl (+0, -58)
/intern/cycles/kernel/osl/nodes/node_color.h (+0, -125)
/intern/cycles/kernel/osl/nodes/node_combine_rgb.osl (+0, -29)
/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_convert_from_int.osl (+0, -36)
/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl (+0, -35)
/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl (+0, -32)
/intern/cycles/kernel/osl/nodes/node_emission.osl (+0, -32)
/intern/cycles/kernel/osl/nodes/node_environment_texture.osl (+0, -34)
/intern/cycles/kernel/osl/nodes/node_fresnel.h (+0, -36)
/intern/cycles/kernel/osl/nodes/node_fresnel.osl (+0, -31)
/intern/cycles/kernel/osl/nodes/node_gamma.osl (+0, -27)
/intern/cycles/kernel/osl/nodes/node_geometry.osl (+0, -50)
/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl (+0, -43)
/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl (+0, -37)
/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl (+0, -74)
/intern/cycles/kernel/osl/nodes/node_holdout.osl (+0, -26)
/intern/cycles/kernel/osl/nodes/node_hsv.osl (+0, -43)
/intern/cycles/kernel/osl/nodes/node_image_texture.osl (+0, -120)
/intern/cycles/kernel/osl/nodes/node_invert.osl (+0, -29)
/intern/cycles/kernel/osl/nodes/node_layer_weight.osl (+0, -46)
/intern/cycles/kernel/osl/nodes/node_light_falloff.osl (+0, -46)
/intern/cycles/kernel/osl/nodes/node_light_path.osl (+0, -41)
/intern/cycles/kernel/osl/nodes/node_magic_texture.osl (+0, -104)
/intern/cycles/kernel/osl/nodes/node_mapping.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_math.osl (+0, -88)
/intern/cycles/kernel/osl/nodes/node_mix.osl (+0, -331)
/intern/cycles/kernel/osl/nodes/node_mix_closure.osl (+0, -30)
/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl (+0, -222)
/intern/cycles/kernel/osl/nodes/node_noise_texture.osl (+0, -56)
/intern/cycles/kernel/osl/nodes/node_normal.osl (+0, -30)
/intern/cycles/kernel/osl/nodes/node_object_info.osl (+0, -32)
/intern/cycles/kernel/osl/nodes/node_output_displacement.osl (+0, -25)
/intern/cycles/kernel/osl/nodes/node_output_surface.osl (+0, -25)
/intern/cycles/kernel/osl/nodes/node_output_volume.osl (+0, -25)
/intern/cycles/kernel/osl/nodes/node_particle_info.osl (+0, -38)
/intern/cycles/kernel/osl/nodes/node_rgb_ramp.osl (+0, -43)
/intern/cycles/kernel/osl/nodes/node_separate_rgb.osl (+0, -30)
/intern/cycles/kernel/osl/nodes/node_set_normal.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_sky_texture.osl (+0, -162)
/intern/cycles/kernel/osl/nodes/node_texture.h (+0, -270)
/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl (+0, -81)
/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl (+0, -28)
/intern/cycles/kernel/osl/nodes/node_value.osl (+0, -33)
/intern/cycles/kernel/osl/nodes/node_vector_math.osl (+0, -53)
/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl (+0, -32)
/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl (+0, -48)
/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl (+0, -30)
/intern/cycles/kernel/osl/nodes/node_wave_texture.osl (+0, -61)
/intern/cycles/kernel/osl/nodes/oslutil.h (+0, -94)
/intern/cycles/kernel/osl/nodes/stdosl.h (+0, -537)
11 Modified Paths:
/CMakeLists.txt (+2, -22) (Diff)
/intern/cycles/blender/addon/engine.py (+1, -0) (Diff)
/intern/cycles/blender/addon/enums.py (+1, -0) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+2, -10) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/kernel_triangle.h (+11, -0) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+0, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+73, -16) (Diff)
/intern/cycles/render/mesh.cpp (+2, -2) (Diff)
/intern/cycles/util/util_md5.h (+1, -1) (Diff)
/source/creator/CMakeLists.txt (+0, -8) (Diff)
/intern/cycles/blender/addon/engine.py (+1, -0) (Diff)
/intern/cycles/blender/addon/enums.py (+1, -0) (Diff)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+2, -10) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/kernel_triangle.h (+11, -0) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+0, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+73, -16) (Diff)
/intern/cycles/render/mesh.cpp (+2, -2) (Diff)
/intern/cycles/util/util_md5.h (+1, -1) (Diff)
/source/creator/CMakeLists.txt (+0, -8) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021