Revision: 61495
https://developer.blender.org/rBL61495
Author: jensverwiebe
Date: 2015-02-08 17:54:59 +0000 (Sun, 08 Feb 2015)
Log Message:
-----------
OSX/OSL: update along with new exr 2.2.0
Modified Paths:
--------------
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/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
trunk/lib/darwin-9.x.universal/osl/threaded_osl_osx_fix.patch
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/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 2015-02-04
08:23:57 UTC (rev 61494)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso 2015-02-08
17:54:59 UTC (rev 61495)
@@ -10,9 +10,9 @@
temp float $tmp3 %read{3,3} %write{2,2}
temp color $tmp4 %read{4,4} %write{3,3}
code ___main___
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl:48
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl:48
# Ci = (power / surfacearea()) * Cs * emission();
- closure $tmp1 $const1
%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/emitter.osl"}
%line{48} %argrw{"wr"}
+ closure $tmp1 $const1
%filename{"/Volumes/Workdata/Blender/Development/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 2015-02-04
08:23:57 UTC (rev 61494)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso 2015-02-08
17:54:59 UTC (rev 61495)
@@ -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___
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:56
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:56
# if (caustics || (!raytype("glossy") && !raytype("diffuse"))) {
- neq $tmp1 caustics $const1
%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl"}
%line{56} %argrw{"wrr"}
+ neq $tmp1 caustics $const1
%filename{"/Volumes/Workdata/Blender/Development/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"}
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:58
+#
/Volumes/Workdata/Blender/Development/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"}
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:59
+#
/Volumes/Workdata/Blender/Development/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"}
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:63
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:63
# if (TIR)
if TIR 23 23 %line{63} %argrw{"r"}
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:64
+#
/Volumes/Workdata/Blender/Development/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"}
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/glass.osl:66
+#
/Volumes/Workdata/Blender/Development/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"}
Modified: trunk/lib/darwin-9.x.universal/osl/shaders/image.oso
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/shaders/image.oso 2015-02-04
08:23:57 UTC (rev 61494)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/image.oso 2015-02-08
17:54:59 UTC (rev 61495)
@@ -16,15 +16,15 @@
const string $const3 "swrap" %read{2,2} %write{2147483647,-1}
const string $const4 "twrap" %read{2,2} %write{2147483647,-1}
code s
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl:37
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl:37
# [[ string help = "s coordinate for the lookup" ]],
- assign s u
%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl"}
%line{37} %argrw{"wr"}
+ assign s u
%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl"}
%line{37} %argrw{"wr"}
code t
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl:39
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl:39
# [[ string help = "t coordinate for the lookup" ]],
- assign t v
%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl"}
%line{39} %argrw{"wr"}
+ assign t v
%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl"}
%line{39} %argrw{"wr"}
code ___main___
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl:59
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl:59
# "swrap", swrap, "twrap", twrap);
- texture Cout filename s t $const1 sblur $const2 tblur $const3
swrap $const4 twrap
%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl"}
%line{59} %argrw{"wrrrrrrrrrrr"} %argderivs{2,3}
+ texture Cout filename s t $const1 sblur $const2 tblur $const3
swrap $const4 twrap
%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/image.osl"}
%line{59} %argrw{"wrrrrrrrrrrr"} %argderivs{2,3}
end
Modified: trunk/lib/darwin-9.x.universal/osl/shaders/matte.oso
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/shaders/matte.oso 2015-02-04
08:23:57 UTC (rev 61494)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/matte.oso 2015-02-08
17:54:59 UTC (rev 61495)
@@ -9,9 +9,9 @@
const string $const1 "diffuse" %read{0,0}
%write{2147483647,-1}
temp color $tmp2 %read{2,2} %write{1,1}
code ___main___
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/matte.osl:42
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/matte.osl:42
# Ci = Kd * Cs * diffuse (N);
- closure $tmp1 $const1 N
%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/matte.osl"}
%line{42} %argrw{"wrr"}
+ closure $tmp1 $const1 N
%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/matte.osl"}
%line{42} %argrw{"wrr"}
mul $tmp2 Kd Cs %argrw{"wrr"}
mul Ci $tmp1 $tmp2 %argrw{"wrr"}
end
Modified: trunk/lib/darwin-9.x.universal/osl/shaders/metal.oso
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/shaders/metal.oso 2015-02-04
08:23:57 UTC (rev 61494)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/metal.oso 2015-02-08
17:54:59 UTC (rev 61495)
@@ -10,9 +10,9 @@
const string $const1 "reflection" %read{0,0}
%write{2147483647,-1}
temp color $tmp2 %read{2,2} %write{1,1}
code ___main___
-#
/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/metal.osl:45
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/metal.osl:45
# Ci = Ks * Cs * reflection (N, eta);
- closure $tmp1 $const1 N eta
%filename{"/Users/blenderfoundation/blender-build/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/metal.osl"}
%line{45} %argrw{"wrrr"}
+ closure $tmp1 $const1 N eta
%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage/src/shaders/metal.osl"}
%line{45} %argrw{"wrrr"}
mul $tmp2 Ks Cs %argrw{"wrr"}
mul Ci $tmp1 $tmp2 %argrw{"wrr"}
end
Modified: trunk/lib/darwin-9.x.universal/osl/shaders/ubersurface.oso
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/shaders/ubersurface.oso 2015-02-04
08:23:57 UTC (rev 61494)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/ubersurface.oso 2015-02-08
17:54:59 UTC (rev 61495)
@@ -149,298 +149,298 @@
temp closure color $tmp39 %read{145,145} %write{144,144}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
