Revision: 61392
https://developer.blender.org/rBL61392
Author: jensverwiebe
Date: 2014-08-01 10:02:19 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
OSX/OSL: update the former 1.5.10-RC3 to Release version
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/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-08-01 08:42:58 UTC (rev
61391)
+++ trunk/lib/darwin-9.x.universal/osl/CHANGES 2014-08-01 10:02:19 UTC (rev
61392)
@@ -1,18 +1,4 @@
-Changes:
-
-Release 1.6 -- in development (compared to 1.5)
------------------------------------------------
-Language, standard libary, and compiler changes (for shader writers):
-API changes, new options, new ShadingSystem features (for renderer writers):
-Performance improvements:
-Bug fixes:
-Under the hood:
-Build & test system improvements and developer goodies:
-Documentation:
-
-
-
-Release 1.5 -- Release candidate July 15, 2014 (compared to 1.4)
+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:
Modified: trunk/lib/darwin-9.x.universal/osl/README.md
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/README.md 2014-08-01 08:42:58 UTC
(rev 61391)
+++ trunk/lib/darwin-9.x.universal/osl/README.md 2014-08-01 10:02:19 UTC
(rev 61392)
@@ -25,9 +25,11 @@
and animation studios who also wish to use it.
OSL is robust and production-proven, and was the exclusive shading
-system for big VFX films such as "Men in Black 3: and "The Amazing
-Spider-Man," animated features such as "Hotel Transylvania", and several
-other films currently in production.
+system for work on big VFX films such as "Men in Black 3", "The Amazing
+Spider-Man," "Oz the Great and Powerful," and "Edge of Tomorrow," as
+well as animated features such as "Hotel Transylvania" and "Cloudy With
+a Chance of Meatballs 2", and many other films completed or currently in
+production.
The OSL code is distributed under the "New BSD" license (see the
"LICENSE" file that comes with the distribution), and the documentation
@@ -218,16 +220,29 @@
-----------------------------------------
At Sony Pictures Imageworks, we are exclusively using OSL in our
-proprietary renderer, "Arnold." Completed productions that used 100%
-OSL for their shading include Men in Black 3, The Amazing Spider-Man,
-and Hotel Transylvania, and other unreleased shows that are still in
-production. Our shader-writing team works entirely in OSL, all
-productions use OSL, and we've even removed all the code from the
-renderer that allows people to write the old-style "C" shaders. At the
-time we removed the old shader facility, the OSL shaders were
-consistently outperforming their equivalent old compiled C shaders in
-the old system.
+proprietary renderer, "Arnold." Completed productions that used OSL for
+shading have included:
+ Men in Black 3
+ The Amazing Spider-Man
+ Hotel Transylvania
+ Oz the Great and Powerful
+ Smurfs 2
+ Cloudy With a Chance of Meatballs 2
+ Amazing Spider-Man 2
+ Edge of Tomorrow
+ Blended
+ 22 Jump Street
+ Guardians of the Galaxy
+ The Interview
+
+And more are currently in production. Our shader-writing team works
+entirely in OSL, all productions use OSL, and we've even removed all the
+code from the renderer that allows people to write the old-style "C"
+shaders. At the time we removed the old shader facility, the OSL
+shaders were consistently outperforming their equivalent old compiled C
+shaders in the old system.
+
In the longer term, there are a number of projects we hope to get to
leading to a 2.x or 3.x cut of the language and library. Among our
long-term goals:
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/oslversion.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h 2014-08-01
08:42:58 UTC (rev 61391)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h 2014-08-01
10:02:19 UTC (rev 61392)
@@ -42,9 +42,9 @@
// Version of this library:
#define OSL_LIBRARY_VERSION_MAJOR 1
-#define OSL_LIBRARY_VERSION_MINOR 6
-#define OSL_LIBRARY_VERSION_PATCH 0
-#define OSL_LIBRARY_VERSION_RELEASE_TYPE dev
+#define OSL_LIBRARY_VERSION_MINOR 5
+#define OSL_LIBRARY_VERSION_PATCH 10
+#define OSL_LIBRARY_VERSION_RELEASE_TYPE
#define OSL_LIBRARY_VERSION_CODE (10000 * OSL_LIBRARY_VERSION_MAJOR + \
100 * OSL_LIBRARY_VERSION_MINOR + \
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-08-01
08:42:58 UTC (rev 61391)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso 2014-08-01
10:02:19 UTC (rev 61392)
@@ -1,5 +1,5 @@
OpenShadingLanguage 1.00
-# Compiled by oslc 1.6.0dev
+# Compiled by oslc 1.5.10
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-10-x86_64/OpenShadingLanguage/src/shaders/emitter.osl:48
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/emitter.osl:48
# Ci = (power / surfacearea()) * Cs * emission();
- closure $tmp1 $const1
%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-10-x86_64/OpenShadingLanguage/src/shaders/emitter.osl"}
%line{48} %argrw{"wr"}
+ 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"}
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-08-01
08:42:58 UTC (rev 61391)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso 2014-08-01
10:02:19 UTC (rev 61392)
@@ -1,5 +1,5 @@
OpenShadingLanguage 1.00
-# Compiled by oslc 1.6.0dev
+# Compiled by oslc 1.5.10
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-10-x86_64/OpenShadingLanguage/src/shaders/glass.osl:56
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl:56
# if (caustics || (!raytype("glossy") && !raytype("diffuse"))) {
- neq $tmp1 caustics $const1
%filename{"/Volumes/Workdata/Blender/Development/lib/darwin-10-x86_64/OpenShadingLanguage/src/shaders/glass.osl"}
%line{56} %argrw{"wrr"}
+ 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"}
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-10-x86_64/OpenShadingLanguage/src/shaders/glass.osl:58
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/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-10-x86_64/OpenShadingLanguage/src/shaders/glass.osl:59
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/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-10-x86_64/OpenShadingLanguage/src/shaders/glass.osl:63
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/src/shaders/glass.osl:63
# if (TIR)
if TIR 23 23 %line{63} %argrw{"r"}
-#
/Volumes/Workdata/Blender/Development/lib/darwin-10-x86_64/OpenShadingLanguage/src/shaders/glass.osl:64
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/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-10-x86_64/OpenShadingLanguage/src/shaders/glass.osl:66
+#
/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-Release-1.5.10/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. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
