[Bf-blender-cvs] [df1e9b662bd] master: Cleanup: Fix build warnings from OSL shader compilation
Ray Molenkamp
noreply at git.blender.org
Wed Feb 12 05:40:29 CET 2020
Commit: df1e9b662bd6938f74579cea9d30341f3b6dd02b
Author: Ray Molenkamp
Date: Tue Feb 11 21:40:23 2020 -0700
Branches: master
https://developer.blender.org/rBdf1e9b662bd6938f74579cea9d30341f3b6dd02b
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
===================================================================
M intern/cycles/kernel/shaders/CMakeLists.txt
M intern/cycles/kernel/shaders/node_absorption_volume.osl
M intern/cycles/kernel/shaders/node_add_closure.osl
M intern/cycles/kernel/shaders/node_ambient_occlusion.osl
M intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl
M intern/cycles/kernel/shaders/node_attribute.osl
M intern/cycles/kernel/shaders/node_background.osl
M intern/cycles/kernel/shaders/node_bevel.osl
M intern/cycles/kernel/shaders/node_blackbody.osl
M intern/cycles/kernel/shaders/node_brick_texture.osl
M intern/cycles/kernel/shaders/node_brightness.osl
M intern/cycles/kernel/shaders/node_bump.osl
M intern/cycles/kernel/shaders/node_camera.osl
M intern/cycles/kernel/shaders/node_checker_texture.osl
M intern/cycles/kernel/shaders/node_clamp.osl
M intern/cycles/kernel/shaders/node_combine_hsv.osl
M intern/cycles/kernel/shaders/node_combine_rgb.osl
M intern/cycles/kernel/shaders/node_combine_xyz.osl
M intern/cycles/kernel/shaders/node_convert_from_color.osl
M intern/cycles/kernel/shaders/node_convert_from_float.osl
M intern/cycles/kernel/shaders/node_convert_from_int.osl
M intern/cycles/kernel/shaders/node_convert_from_normal.osl
M intern/cycles/kernel/shaders/node_convert_from_point.osl
M intern/cycles/kernel/shaders/node_convert_from_string.osl
M intern/cycles/kernel/shaders/node_convert_from_vector.osl
M intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
M intern/cycles/kernel/shaders/node_displacement.osl
M intern/cycles/kernel/shaders/node_emission.osl
M intern/cycles/kernel/shaders/node_environment_texture.osl
M intern/cycles/kernel/shaders/node_fresnel.osl
M intern/cycles/kernel/shaders/node_gamma.osl
M intern/cycles/kernel/shaders/node_geometry.osl
M intern/cycles/kernel/shaders/node_glass_bsdf.osl
M intern/cycles/kernel/shaders/node_glossy_bsdf.osl
M intern/cycles/kernel/shaders/node_gradient_texture.osl
M intern/cycles/kernel/shaders/node_hair_bsdf.osl
M intern/cycles/kernel/shaders/node_hair_info.osl
M intern/cycles/kernel/shaders/node_hash.h
M intern/cycles/kernel/shaders/node_holdout.osl
M intern/cycles/kernel/shaders/node_hsv.osl
M intern/cycles/kernel/shaders/node_ies_light.osl
M intern/cycles/kernel/shaders/node_image_texture.osl
M intern/cycles/kernel/shaders/node_invert.osl
M intern/cycles/kernel/shaders/node_layer_weight.osl
M intern/cycles/kernel/shaders/node_light_falloff.osl
M intern/cycles/kernel/shaders/node_light_path.osl
M intern/cycles/kernel/shaders/node_magic_texture.osl
M intern/cycles/kernel/shaders/node_map_range.osl
M intern/cycles/kernel/shaders/node_mapping.osl
M intern/cycles/kernel/shaders/node_math.osl
M intern/cycles/kernel/shaders/node_mix.osl
M intern/cycles/kernel/shaders/node_mix_closure.osl
M intern/cycles/kernel/shaders/node_musgrave_texture.osl
M intern/cycles/kernel/shaders/node_noise_texture.osl
M intern/cycles/kernel/shaders/node_normal.osl
M intern/cycles/kernel/shaders/node_normal_map.osl
M intern/cycles/kernel/shaders/node_object_info.osl
M intern/cycles/kernel/shaders/node_output_displacement.osl
M intern/cycles/kernel/shaders/node_output_surface.osl
M intern/cycles/kernel/shaders/node_output_volume.osl
M intern/cycles/kernel/shaders/node_particle_info.osl
M intern/cycles/kernel/shaders/node_principled_bsdf.osl
M intern/cycles/kernel/shaders/node_principled_hair_bsdf.osl
M intern/cycles/kernel/shaders/node_principled_volume.osl
M intern/cycles/kernel/shaders/node_refraction_bsdf.osl
M intern/cycles/kernel/shaders/node_rgb_curves.osl
M intern/cycles/kernel/shaders/node_rgb_ramp.osl
M intern/cycles/kernel/shaders/node_rgb_to_bw.osl
M intern/cycles/kernel/shaders/node_scatter_volume.osl
M intern/cycles/kernel/shaders/node_separate_hsv.osl
M intern/cycles/kernel/shaders/node_separate_rgb.osl
M intern/cycles/kernel/shaders/node_separate_xyz.osl
M intern/cycles/kernel/shaders/node_set_normal.osl
M intern/cycles/kernel/shaders/node_sky_texture.osl
M intern/cycles/kernel/shaders/node_subsurface_scattering.osl
M intern/cycles/kernel/shaders/node_tangent.osl
M intern/cycles/kernel/shaders/node_texture_coordinate.osl
M intern/cycles/kernel/shaders/node_toon_bsdf.osl
M intern/cycles/kernel/shaders/node_translucent_bsdf.osl
M intern/cycles/kernel/shaders/node_transparent_bsdf.osl
M intern/cycles/kernel/shaders/node_uv_map.osl
M intern/cycles/kernel/shaders/node_value.osl
M intern/cycles/kernel/shaders/node_vector_curves.osl
M intern/cycles/kernel/shaders/node_vector_displacement.osl
M intern/cycles/kernel/shaders/node_vector_math.osl
M intern/cycles/kernel/shaders/node_vector_transform.osl
M intern/cycles/kernel/shaders/node_velvet_bsdf.osl
M intern/cycles/kernel/shaders/node_vertex_color.osl
M intern/cycles/kernel/shaders/node_voronoi_texture.osl
M intern/cycles/kernel/shaders/node_voxel_texture.osl
M intern/cycles/kernel/shaders/node_wave_texture.osl
M intern/cycles/kernel/shaders/node_wavelength.osl
M intern/cycles/kernel/shaders/node_white_noise_texture.osl
M intern/cycles/kernel/shaders/node_wireframe.osl
D intern/cycles/kernel/shaders/oslutil.h
A intern/cycles/kernel/shaders/stdcycles.h
D intern/cycles/kernel/shaders/stdosl.h
D intern/cycles/kernel/shaders/vector2.h
D intern/cycles/kernel/shaders/vector4.h
M intern/cycles/render/osl.cpp
===================================================================
diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt
index f4258da70d3..8605f23b8fa 100644
--- a/intern/cycles/kernel/shaders/CMakeLists.txt
+++ b/intern/cycles/kernel/shaders/CMakeLists.txt
@@ -95,16 +95,27 @@ set(SRC_OSL
node_rgb_to_bw.osl
)
+# FindOSL.cmake does not give us the location of the shader library
+# but generally it can be figured out from the location of the oslc
+# compiler. However if this fails you can set OSL_SHADER_DIR to
+# bypass the auto discovery.
+if(NOT DEFINED OSL_SHADER_DIR)
+ get_filename_component(OSL_SHADER_DIR ${OSL_COMPILER} DIRECTORY)
+ get_filename_component(OSL_SHADER_DIR ${OSL_SHADER_DIR}/../shaders ABSOLUTE)
+endif()
+
+# The headers that OSL ships differs per release so we can not
+# hardcode this.
+file(GLOB SRC_OSL_HEADER_DIST ${OSL_SHADER_DIR}/*.h)
+
set(SRC_OSL_HEADERS
node_color.h
node_fresnel.h
node_hash.h
node_noise.h
node_ramp_util.h
- stdosl.h
- oslutil.h
- vector2.h
- vector4.h
+ stdcycles.h
+ ${SRC_OSL_HEADER_DIST}
)
set(SRC_OSO
diff --git a/intern/cycles/kernel/shaders/node_absorption_volume.osl b/intern/cycles/kernel/shaders/node_absorption_volume.osl
index e99bd254666..37ccc4c969f 100644
--- a/intern/cycles/kernel/shaders/node_absorption_volume.osl
+++ b/intern/cycles/kernel/shaders/node_absorption_volume.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_absorption_volume(color Color = color(0.8, 0.8, 0.8),
float Density = 1.0,
diff --git a/intern/cycles/kernel/shaders/node_add_closure.osl b/intern/cycles/kernel/shaders/node_add_closure.osl
index 077e2735e61..27ecc9ef0c2 100644
--- a/intern/cycles/kernel/shaders/node_add_closure.osl
+++ b/intern/cycles/kernel/shaders/node_add_closure.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_add_closure(closure color Closure1 = 0,
closure color Closure2 = 0,
diff --git a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
index 7bf28719e78..22d245d0698 100644
--- a/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
+++ b/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_ambient_occlusion(color ColorIn = color(1.0, 1.0, 1.0),
int samples = 16,
diff --git a/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl b/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl
index 165c09eb8e0..5da511b9619 100644
--- a/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl
+++ b/intern/cycles/kernel/shaders/node_anisotropic_bsdf.osl
@@ -13,8 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-#include "stdosl.h"
+ #include "stdcycles.h"
shader node_anisotropic_bsdf(color Color = 0.0,
string distribution = "GGX",
diff --git a/intern/cycles/kernel/shaders/node_attribute.osl b/intern/cycles/kernel/shaders/node_attribute.osl
index 336543cc130..abec8ebfbf0 100644
--- a/intern/cycles/kernel/shaders/node_attribute.osl
+++ b/intern/cycles/kernel/shaders/node_attribute.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_attribute(string bump_offset = "center",
string name = "",
diff --git a/intern/cycles/kernel/shaders/node_background.osl b/intern/cycles/kernel/shaders/node_background.osl
index 6ded0d2c65c..3f45db751b3 100644
--- a/intern/cycles/kernel/shaders/node_background.osl
+++ b/intern/cycles/kernel/shaders/node_background.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_background(color Color = 0.8,
float Strength = 1.0,
diff --git a/intern/cycles/kernel/shaders/node_bevel.osl b/intern/cycles/kernel/shaders/node_bevel.osl
index 189c20c52e7..e87ddab716d 100644
--- a/intern/cycles/kernel/shaders/node_bevel.osl
+++ b/intern/cycles/kernel/shaders/node_bevel.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_bevel(int samples = 4,
float Radius = 0.05,
diff --git a/intern/cycles/kernel/shaders/node_blackbody.osl b/intern/cycles/kernel/shaders/node_blackbody.osl
index 8a24bf1e28b..741efae755d 100644
--- a/intern/cycles/kernel/shaders/node_blackbody.osl
+++ b/intern/cycles/kernel/shaders/node_blackbody.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_blackbody(float Temperature = 1200.0, output color Color = 0.0)
{
diff --git a/intern/cycles/kernel/shaders/node_brick_texture.osl b/intern/cycles/kernel/shaders/node_brick_texture.osl
index 30644ef2ff3..075a324c730 100644
--- a/intern/cycles/kernel/shaders/node_brick_texture.osl
+++ b/intern/cycles/kernel/shaders/node_brick_texture.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
/* Brick */
diff --git a/intern/cycles/kernel/shaders/node_brightness.osl b/intern/cycles/kernel/shaders/node_brightness.osl
index 2defbc4b1db..019edfb79a3 100644
--- a/intern/cycles/kernel/shaders/node_brightness.osl
+++ b/intern/cycles/kernel/shaders/node_brightness.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_brightness(color ColorIn = 0.8,
float Bright = 0.0,
diff --git a/intern/cycles/kernel/shaders/node_bump.osl b/intern/cycles/kernel/shaders/node_bump.osl
index 3697bb37fd9..811182f40b5 100644
--- a/intern/cycles/kernel/shaders/node_bump.osl
+++ b/intern/cycles/kernel/shaders/node_bump.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
/* "Bump Mapping Unparameterized Surfaces on the GPU"
* Morten S. Mikkelsen, 2010 */
diff --git a/intern/cycles/kernel/shaders/node_camera.osl b/intern/cycles/kernel/shaders/node_camera.osl
index 833e9e775fe..45ca50c6e1e 100644
--- a/intern/cycles/kernel/shaders/node_camera.osl
+++ b/intern/cycles/kernel/shaders/node_camera.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_camera(output vector ViewVector = vector(0.0, 0.0, 0.0),
output float ViewZDepth = 0.0,
diff --git a/intern/cycles/kernel/shaders/node_checker_texture.osl b/intern/cycles/kernel/shaders/node_checker_texture.osl
index e05cf20099f..d6a30dbdb40 100644
--- a/intern/cycles/kernel/shaders/node_checker_texture.osl
+++ b/intern/cycles/kernel/shaders/node_checker_texture.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
/* Checker */
diff --git a/intern/cycles/kernel/shaders/node_clamp.osl b/intern/cycles/kernel/shaders/node_clamp.osl
index d689ba7f809..ce9392a0d98 100644
--- a/intern/cycles/kernel/shaders/node_clamp.osl
+++ b/intern/cycles/kernel/shaders/node_clamp.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_clamp(string type = "minmax",
float Value = 1.0,
diff --git a/intern/cycles/kernel/shaders/node_combine_hsv.osl b/intern/cycles/kernel/shaders/node_combine_hsv.osl
index 1658cf3d774..05e502b5bc1 100644
--- a/intern/cycles/kernel/shaders/node_combine_hsv.osl
+++ b/intern/cycles/kernel/shaders/node_combine_hsv.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_combine_hsv(float H = 0.0, float S = 0.0, float V = 0.0, output color Color = 0.8)
{
diff --git a/intern/cycles/kernel/shaders/node_combine_rgb.osl b/intern/cycles/kernel/shaders/node_combine_rgb.osl
index aaa95e9c5af..036f371eb5c 100644
--- a/intern/cycles/kernel/shaders/node_combine_rgb.osl
+++ b/intern/cycles/kernel/shaders/node_combine_rgb.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_combine_rgb(float R = 0.0, float G = 0.0, float B = 0.0, output color Image = 0.8)
{
diff --git a/intern/cycles/kernel/shaders/node_combine_xyz.osl b/intern/cycles/kernel/shaders/node_combine_xyz.osl
index 4ab49168704..4ebd86b605c 100644
--- a/intern/cycles/kernel/shaders/node_combine_xyz.osl
+++ b/intern/cycles/kernel/shaders/node_combine_xyz.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_combine_xyz(float X = 0.0, float Y = 0.0, float Z = 0.0, output vector Vector = 0.8)
{
diff --git a/intern/cycles/kernel/shaders/node_convert_from_color.osl b/intern/cycles/kernel/shaders/node_convert_from_color.osl
index 7ea9a1e4fb3..c3f0e118844 100644
--- a/intern/cycles/kernel/shaders/node_convert_from_color.osl
+++ b/intern/cycles/kernel/shaders/node_convert_from_color.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_convert_from_color(color value_color = 0.0,
output string value_string = "",
diff --git a/intern/cycles/kernel/shaders/node_convert_from_float.osl b/intern/cycles/kernel/shaders/node_convert_from_float.osl
index 13b5dea0838..61a15a1c2b0 100644
--- a/intern/cycles/kernel/shaders/node_convert_from_float.osl
+++ b/intern/cycles/kernel/shaders/node_convert_from_float.osl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "stdosl.h"
+#include "stdcycles.h"
shader node_convert_from_float(float value_float = 0.0,
output string value_string = "",
diff --git a/intern/cycles/kernel/shaders/node_convert_from_int.osl b/intern/cycles/kernel/shaders/node_convert_from_int.osl
index a59e025d822..2e6a99b2765 100644
--- a/intern/cycles/kernel/shaders/node_convert_from_int.osl
+++ b/intern/cycles/kern
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list