[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61447] trunk/lib/ darwin-9.x.universal/osl: OSX: Update OSL to 1.5.11 with our alignment fixes applied

Sergey Sharybin sergey.vfx at gmail.com
Mon Nov 24 17:44:46 CET 2014


Revision: 61447
          https://developer.blender.org/rBL61447
Author:   sergey
Date:     2014-11-24 16:44:44 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
OSX: Update OSL to 1.5.11 with our alignment fixes applied

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/osl/CHANGES
    trunk/lib/darwin-9.x.universal/osl/README.md
    trunk/lib/darwin-9.x.universal/osl/bin/oslc
    trunk/lib/darwin-9.x.universal/osl/bin/oslinfo
    trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h
    trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h
    trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
    trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
    trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
    trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso
    trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso
    trunk/lib/darwin-9.x.universal/osl/shaders/image.oso
    trunk/lib/darwin-9.x.universal/osl/shaders/matte.oso
    trunk/lib/darwin-9.x.universal/osl/shaders/metal.oso
    trunk/lib/darwin-9.x.universal/osl/shaders/ubersurface.oso

Modified: trunk/lib/darwin-9.x.universal/osl/CHANGES
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/CHANGES	2014-11-19 19:27:14 UTC (rev 61446)
+++ trunk/lib/darwin-9.x.universal/osl/CHANGES	2014-11-24 16:44:44 UTC (rev 61447)
@@ -1,5 +1,20 @@
+
+Release 1.5.11 -- 22 Sep 2014 (compared to 1.5.10)
+--------------------------------------------------
+* Windows compilations fixes for very MSVC 2013.
+* Windows build fix for compiling shaders finding the right oslc.exe.
+  #399
+* Speedup from telling gcc/clang to ignore the fact that math functions
+  can set errno (helps code generation of sqrtf in particular.
+* Fix thread contention issue in testshade which could make it hard to
+  use testshade as a benchmark with many threads.
+* Make it build properly with LLVM 3.5.
+* Fix compiler warnings about signed/unsigned comparisons.
+
+
+
 Release 1.5 -- July 30, 2014 (compared to 1.4)
-----------------------------------------------
+------------------------------------------------------
 Language, standard libary, and compiler changes (for shader writers):
 * New closure function for microfacet BSDFs:
     closure color microfacet (string distribution, normal N,
@@ -248,6 +263,8 @@
   shader that rely on userdata. #395 (1.5.10)
 * Fixes for Boost 1.55 + Linux combination, where it needed -lrt on the
   link line. #394 (1.5.10)
+* Windows build fix for compiling shaders finding the right oslc.exe.
+  #399 (1.5.11)
 
 Documentation:
 * Clarified docs about floor(). (1.5.8)

Modified: trunk/lib/darwin-9.x.universal/osl/README.md
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/README.md	2014-11-19 19:27:14 UTC (rev 61446)
+++ trunk/lib/darwin-9.x.universal/osl/README.md	2014-11-24 16:44:44 UTC (rev 61447)
@@ -324,9 +324,10 @@
 * Brecht Van Lommel
 
 Additionally, many others have contributed fixes and other small
-changes: Shane Ambler, Sven-Hendrik Haase, Erich Ocean, Mikko Ohtamaa,
-Alex Schworer, Alexander von Knorring.  (Listed alphabetically; if we've
-left anybody out, please let us know.)
+changes: Shane Ambler, Martijn Berger, Matthaus G. Chajdas, Thomas
+Dinges, Sven-Hendrik Haase, Ronan Keryell, Bastien Montagne, Erich
+Ocean, Mikko Ohtamaa, Alex Schworer, Alexander von Knorring. (Listed
+alphabetically; if we've left anybody out, please let us know.)
 
 We cannot possibly express sufficient gratitude to the managers at Sony
 Pictures Imageworks who allowed this project to proceed, supported it

Modified: trunk/lib/darwin-9.x.universal/osl/bin/oslc
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/bin/oslinfo
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h	2014-11-19 19:27:14 UTC (rev 61446)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h	2014-11-24 16:44:44 UTC (rev 61447)
@@ -234,9 +234,9 @@
     ///   int num_textures_needed    The number of texture names that are
     ///                                known to be potentially needed by the
     ///                                group (after optimization).
-    ///   string textures_needed[]   The names of the textures known to be
-    ///                                needed. Must be of length at least as
-    ///                                long as num_textures_needed.
+    ///   ptr textures_needed        Retrieves a pointer to the ustring array
+    ///                                containing all textures known to be
+    ///                                needed.
     ///   int unknown_textures_needed  Nonzero if additional textures may be
     ///                                needed, whose names can't be known
     ///                                without actually running the shader.

Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h	2014-11-19 19:27:14 UTC (rev 61446)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h	2014-11-24 16:44:44 UTC (rev 61447)
@@ -43,7 +43,7 @@
 // Version of this library:
 #define OSL_LIBRARY_VERSION_MAJOR 1
 #define OSL_LIBRARY_VERSION_MINOR 5
-#define OSL_LIBRARY_VERSION_PATCH 10
+#define OSL_LIBRARY_VERSION_PATCH 11
 #define OSL_LIBRARY_VERSION_RELEASE_TYPE 
 
 #define OSL_LIBRARY_VERSION_CODE (10000 * OSL_LIBRARY_VERSION_MAJOR + \

Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso	2014-11-19 19:27:14 UTC (rev 61446)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso	2014-11-24 16:44:44 UTC (rev 61447)
@@ -1,5 +1,5 @@
 OpenShadingLanguage 1.00
-# Compiled by oslc 1.5.10
+# Compiled by oslc 1.5.11
 surface emitter
 param	float	power	1 		%meta{string,help,"Total power of the light"}  %read{2,2} %write{2147483647,-1}
 param	color	Cs	1 1 1 		%meta{string,help,"Base color"}  %read{3,3} %write{2147483647,-1}
@@ -10,9 +10,9 @@
 temp	float	$tmp3	 %read{3,3} %write{2,2}
 temp	color	$tmp4	 %read{4,4} %write{3,3}
 code ___main___
-# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/emitter.osl:48
+# /Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl:48
 #     Ci = (power / surfacearea()) * Cs * emission();
-	closure		$tmp1 $const1 	%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/emitter.osl"} %line{48} %argrw{"wr"}
+	closure		$tmp1 $const1 	%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl"} %line{48} %argrw{"wr"}
 	surfacearea	$tmp2 	%argrw{"w"}
 	div		$tmp3 power $tmp2 	%argrw{"wrr"}
 	mul		$tmp4 $tmp3 Cs 	%argrw{"wrr"}

Modified: trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso	2014-11-19 19:27:14 UTC (rev 61446)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso	2014-11-24 16:44:44 UTC (rev 61447)
@@ -1,5 +1,5 @@
 OpenShadingLanguage 1.00
-# Compiled by oslc 1.5.10
+# Compiled by oslc 1.5.11
 surface glass
 param	float	Ks	1 		%meta{string,help,"Color scaling of the refraction"} %meta{float,min,0} %meta{float,max,1}  %read{21,24} %write{2147483647,-1}
 param	color	Cs	1 1 1 		%meta{string,help,"Base color"} %meta{float,min,0} %meta{float,max,1}  %read{17,26} %write{2147483647,-1}
@@ -33,9 +33,9 @@
 temp	closure color	$tmp17	 %read{26,26} %write{25,25}
 temp	closure color	$tmp18	 %read{27,27} %write{26,26}
 code ___main___
-# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl:56
+# /Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:56
 #     if (caustics || (!raytype("glossy") && !raytype("diffuse"))) {
-	neq		$tmp1 caustics $const1 	%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl"} %line{56} %argrw{"wrr"}
+	neq		$tmp1 caustics $const1 	%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl"} %line{56} %argrw{"wrr"}
 	if		$tmp1 2 12 	%argrw{"r"}
 	raytype		$tmp2 $const2 	%argrw{"wr"}
 	eq		$tmp3 $tmp2 $const1 	%argrw{"wrr"}
@@ -48,25 +48,25 @@
 	neq		$tmp8 $tmp4 $const1 	%argrw{"wrr"}
 	assign		$tmp1 $tmp8 	%argrw{"wr"}
 	if		$tmp1 28 28 	%argrw{"r"}
-# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl:58
+# /Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:58
 #         if (backfacing()) {
 	backfacing	$tmp9 	%line{58} %argrw{"w"}
 	if		$tmp9 23 28 	%argrw{"r"}
-# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl:59
+# /Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:59
 #             Ci = Cs * refraction(N, 1.0 / eta);
 	div		$tmp11 $const4 eta 	%line{59} %argrw{"wrr"}
 	closure		$tmp10 $const5 N $tmp11 	%argrw{"wrrr"}
 	mul		Ci $tmp10 Cs 	%argrw{"wrr"}
-# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl:63
+# /Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:63
 #             if (TIR)
 	if		TIR 23 23 	%line{63} %argrw{"r"}
-# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl:64
+# /Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:64
 #                Ci += Ks * reflection(N, 1.0 / eta);
 	div		$tmp13 $const4 eta 	%line{64} %argrw{"wrr"}
 	closure		$tmp12 $const6 N $tmp13 	%argrw{"wrrr"}
 	mul		$tmp14 $tmp12 Ks 	%argrw{"wrr"}
 	add		Ci Ci $tmp14 	%argrw{"wrr"}
-# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl:66
+# /Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:66
 #             Ci = Ks * reflection(N, eta) + Cs * refraction(N, eta);
 	closure		$tmp15 $const6 N eta 	%line{66} %argrw{"wrrr"}
 	mul		$tmp16 $tmp15 Ks 	%argrw{"wrr"}


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list