Blender Git Loki
Git Commits -> Revision df1e9b6
Revision df1e9b6 by Ray molenkamp (master) February 12, 2020, 04:40 (GMT) |
Cleanup: Fix build warnings from OSL shader compilation There were to copies of stdosl.h one from stock OSL and one in the cycles tree augmented with cycles specific closures. moved the cycles ones to stdcycles.h and copied the stock stdosl.h and accompanying headers from the OSL shader folder. for further details see D6812. Reviewed By: brecht Differential Revision: https://developer.blender.org/D6812 |
Commit Details:
Full Hash: df1e9b662bd6938f74579cea9d30341f3b6dd02b
Parent Commit: 6a28d14
Lines Changed: +260, -1698
1 Added Path:
/intern/cycles/kernel/shaders/stdcycles.h (+151, -0) (View)
4 Deleted Paths:
/intern/cycles/kernel/shaders/oslutil.h (+0, -101)
/intern/cycles/kernel/shaders/stdosl.h (+0, -880)
/intern/cycles/kernel/shaders/vector2.h (+0, -291)
/intern/cycles/kernel/shaders/vector4.h (+0, -327)
/intern/cycles/kernel/shaders/stdosl.h (+0, -880)
/intern/cycles/kernel/shaders/vector2.h (+0, -291)
/intern/cycles/kernel/shaders/vector4.h (+0, -327)
95 Modified Paths:
/intern/cycles/kernel/shaders/CMakeLists.txt (+15, -4) (Diff)
/intern/cycles/kernel/shaders/node_absorption_volume.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_add_closure.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_ambient_occlusion.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl (+1, -2) (Diff)
/intern/cycles/kernel/shaders/node_attribute.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_background.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_bevel.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_blackbody.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_brick_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_brightness.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_bump.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_camera.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_checker_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_clamp.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_combine_hsv.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_combine_rgb.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_combine_xyz.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_color.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_float.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_int.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_normal.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_point.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_string.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_vector.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_displacement.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_emission.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_environment_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_fresnel.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_gamma.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_geometry.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_glass_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_glossy_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_gradient_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_hair_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_hair_info.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_hash.h (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_holdout.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_hsv.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_ies_light.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_image_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_invert.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_layer_weight.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_light_falloff.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_light_path.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_magic_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_mapping.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_map_range.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_math.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_mix.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_mix_closure.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_musgrave_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_noise_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_normal.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_normal_map.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_object_info.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_output_displacement.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_output_surface.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_output_volume.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_particle_info.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_principled_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_principled_volume.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_refraction_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_rgb_curves.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_rgb_ramp.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_rgb_to_bw.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_scatter_volume.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_separate_hsv.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_separate_rgb.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_separate_xyz.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_set_normal.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_sky_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_subsurface_scattering.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_tangent.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_texture_coordinate.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_toon_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_translucent_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_transparent_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_uv_map.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_value.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vector_curves.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vector_displacement.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vector_math.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vector_transform.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_velvet_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vertex_color.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_voronoi_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_voxel_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_wavelength.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_wave_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_white_noise_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_wireframe.osl (+1, -1) (Diff)
/intern/cycles/render/osl.cpp (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_absorption_volume.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_add_closure.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_ambient_occlusion.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl (+1, -2) (Diff)
/intern/cycles/kernel/shaders/node_attribute.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_background.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_bevel.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_blackbody.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_brick_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_brightness.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_bump.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_camera.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_checker_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_clamp.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_combine_hsv.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_combine_rgb.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_combine_xyz.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_color.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_float.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_int.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_normal.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_point.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_string.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_convert_from_vector.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_displacement.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_emission.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_environment_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_fresnel.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_gamma.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_geometry.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_glass_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_glossy_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_gradient_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_hair_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_hair_info.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_hash.h (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_holdout.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_hsv.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_ies_light.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_image_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_invert.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_layer_weight.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_light_falloff.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_light_path.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_magic_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_mapping.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_map_range.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_math.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_mix.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_mix_closure.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_musgrave_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_noise_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_normal.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_normal_map.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_object_info.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_output_displacement.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_output_surface.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_output_volume.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_particle_info.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_principled_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_principled_volume.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_refraction_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_rgb_curves.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_rgb_ramp.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_rgb_to_bw.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_scatter_volume.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_separate_hsv.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_separate_rgb.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_separate_xyz.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_set_normal.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_sky_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_subsurface_scattering.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_tangent.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_texture_coordinate.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_toon_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_translucent_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_transparent_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_uv_map.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_value.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vector_curves.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vector_displacement.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vector_math.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vector_transform.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_velvet_bsdf.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_vertex_color.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_voronoi_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_voxel_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_wavelength.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_wave_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_white_noise_texture.osl (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_wireframe.osl (+1, -1) (Diff)
/intern/cycles/render/osl.cpp (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021