Cleanup: Fix build warnings from OSL shader compilation
authorRay Molenkamp <github@lazydodo.com>
Wed, 12 Feb 2020 04:40:23 +0000 (21:40 -0700)
committerRay Molenkamp <github@lazydodo.com>
Wed, 12 Feb 2020 04:40:23 +0000 (21:40 -0700)
commitdf1e9b662bd6938f74579cea9d30341f3b6dd02b
treee71eb89d09b33a06b1fd75f71d683b631ea415ef
parent6a28d14f7236b3e6fbe7409da9ee916878d65feb
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
100 files changed:
intern/cycles/kernel/shaders/CMakeLists.txt
intern/cycles/kernel/shaders/node_absorption_volume.osl
intern/cycles/kernel/shaders/node_add_closure.osl
intern/cycles/kernel/shaders/node_ambient_occlusion.osl
intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl
intern/cycles/kernel/shaders/node_attribute.osl
intern/cycles/kernel/shaders/node_background.osl
intern/cycles/kernel/shaders/node_bevel.osl
intern/cycles/kernel/shaders/node_blackbody.osl
intern/cycles/kernel/shaders/node_brick_texture.osl
intern/cycles/kernel/shaders/node_brightness.osl
intern/cycles/kernel/shaders/node_bump.osl
intern/cycles/kernel/shaders/node_camera.osl
intern/cycles/kernel/shaders/node_checker_texture.osl
intern/cycles/kernel/shaders/node_clamp.osl
intern/cycles/kernel/shaders/node_combine_hsv.osl
intern/cycles/kernel/shaders/node_combine_rgb.osl
intern/cycles/kernel/shaders/node_combine_xyz.osl
intern/cycles/kernel/shaders/node_convert_from_color.osl
intern/cycles/kernel/shaders/node_convert_from_float.osl
intern/cycles/kernel/shaders/node_convert_from_int.osl
intern/cycles/kernel/shaders/node_convert_from_normal.osl
intern/cycles/kernel/shaders/node_convert_from_point.osl
intern/cycles/kernel/shaders/node_convert_from_string.osl
intern/cycles/kernel/shaders/node_convert_from_vector.osl
intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
intern/cycles/kernel/shaders/node_displacement.osl
intern/cycles/kernel/shaders/node_emission.osl
intern/cycles/kernel/shaders/node_environment_texture.osl
intern/cycles/kernel/shaders/node_fresnel.osl
intern/cycles/kernel/shaders/node_gamma.osl
intern/cycles/kernel/shaders/node_geometry.osl
intern/cycles/kernel/shaders/node_glass_bsdf.osl
intern/cycles/kernel/shaders/node_glossy_bsdf.osl
intern/cycles/kernel/shaders/node_gradient_texture.osl
intern/cycles/kernel/shaders/node_hair_bsdf.osl
intern/cycles/kernel/shaders/node_hair_info.osl
intern/cycles/kernel/shaders/node_hash.h
intern/cycles/kernel/shaders/node_holdout.osl
intern/cycles/kernel/shaders/node_hsv.osl
intern/cycles/kernel/shaders/node_ies_light.osl
intern/cycles/kernel/shaders/node_image_texture.osl
intern/cycles/kernel/shaders/node_invert.osl
intern/cycles/kernel/shaders/node_layer_weight.osl
intern/cycles/kernel/shaders/node_light_falloff.osl
intern/cycles/kernel/shaders/node_light_path.osl
intern/cycles/kernel/shaders/node_magic_texture.osl
intern/cycles/kernel/shaders/node_map_range.osl
intern/cycles/kernel/shaders/node_mapping.osl
intern/cycles/kernel/shaders/node_math.osl
intern/cycles/kernel/shaders/node_mix.osl
intern/cycles/kernel/shaders/node_mix_closure.osl
intern/cycles/kernel/shaders/node_musgrave_texture.osl
intern/cycles/kernel/shaders/node_noise_texture.osl
intern/cycles/kernel/shaders/node_normal.osl
intern/cycles/kernel/shaders/node_normal_map.osl
intern/cycles/kernel/shaders/node_object_info.osl
intern/cycles/kernel/shaders/node_output_displacement.osl
intern/cycles/kernel/shaders/node_output_surface.osl
intern/cycles/kernel/shaders/node_output_volume.osl
intern/cycles/kernel/shaders/node_particle_info.osl
intern/cycles/kernel/shaders/node_principled_bsdf.osl
intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
intern/cycles/kernel/shaders/node_principled_volume.osl
intern/cycles/kernel/shaders/node_refraction_bsdf.osl
intern/cycles/kernel/shaders/node_rgb_curves.osl
intern/cycles/kernel/shaders/node_rgb_ramp.osl
intern/cycles/kernel/shaders/node_rgb_to_bw.osl
intern/cycles/kernel/shaders/node_scatter_volume.osl
intern/cycles/kernel/shaders/node_separate_hsv.osl
intern/cycles/kernel/shaders/node_separate_rgb.osl
intern/cycles/kernel/shaders/node_separate_xyz.osl
intern/cycles/kernel/shaders/node_set_normal.osl
intern/cycles/kernel/shaders/node_sky_texture.osl
intern/cycles/kernel/shaders/node_subsurface_scattering.osl
intern/cycles/kernel/shaders/node_tangent.osl
intern/cycles/kernel/shaders/node_texture_coordinate.osl
intern/cycles/kernel/shaders/node_toon_bsdf.osl
intern/cycles/kernel/shaders/node_translucent_bsdf.osl
intern/cycles/kernel/shaders/node_transparent_bsdf.osl
intern/cycles/kernel/shaders/node_uv_map.osl
intern/cycles/kernel/shaders/node_value.osl
intern/cycles/kernel/shaders/node_vector_curves.osl
intern/cycles/kernel/shaders/node_vector_displacement.osl
intern/cycles/kernel/shaders/node_vector_math.osl
intern/cycles/kernel/shaders/node_vector_transform.osl
intern/cycles/kernel/shaders/node_velvet_bsdf.osl
intern/cycles/kernel/shaders/node_vertex_color.osl
intern/cycles/kernel/shaders/node_voronoi_texture.osl
intern/cycles/kernel/shaders/node_voxel_texture.osl
intern/cycles/kernel/shaders/node_wave_texture.osl
intern/cycles/kernel/shaders/node_wavelength.osl
intern/cycles/kernel/shaders/node_white_noise_texture.osl
intern/cycles/kernel/shaders/node_wireframe.osl
intern/cycles/kernel/shaders/oslutil.h [deleted file]
intern/cycles/kernel/shaders/stdcycles.h [new file with mode: 0644]
intern/cycles/kernel/shaders/stdosl.h [deleted file]
intern/cycles/kernel/shaders/vector2.h [deleted file]
intern/cycles/kernel/shaders/vector4.h [deleted file]
intern/cycles/render/osl.cpp