[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57818] trunk/lib/darwin-9.x.universal/osl : OSX/OSL: update libs and bins to 1.3.2
jens verwiebe
info at jensverwiebe.de
Thu Jun 27 13:23:45 CEST 2013
Revision: 57818
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57818
Author: jensverwiebe
Date: 2013-06-27 11:23:44 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
OSX/OSL: update libs and bins to 1.3.2
Modified Paths:
--------------
trunk/lib/darwin-9.x.universal/osl/CHANGES
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/doc/osl-languagespec.pdf
trunk/lib/darwin-9.x.universal/osl/include/OSL/oslconfig.h
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/stdosl.h
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 2013-06-27 11:10:32 UTC (rev 57817)
+++ trunk/lib/darwin-9.x.universal/osl/CHANGES 2013-06-27 11:23:44 UTC (rev 57818)
@@ -1,3 +1,38 @@
+Release 1.3.2 - 19 Jun 2013 (compared to 1.3.1)
+-----------------------------------------------
+* fmod(triple,triple,float) was not working properly in Windows.
+* Nicer debug printing (for developers) when an op doesn't have an
+ associated source line.
+* Avoid incorrect heap addressing when retrieving a symbol's address.
+* oslc new gives a compile error when trying to use a function as
+ if it were an ordinary variable.
+* Fix for a bug where an early 'return' from a shader could lead to
+ output parameters not being properly copied to the inputs of their
+ downstream connections.
+* Fix bug where filterwidth() didn't properly mark itself as needing
+ derivatives of its argument.
+
+
+Release 1.3.1 - 15 May 2013 (compared to 1.3.0)
+-----------------------------------------------
+* The integer versions of min(), max(), and clamp() were not working
+ properly.
+* Added CMake option 'ENABLERTTI' that enables use of RTTI for sites that
+ must link against an RTTI-enabled LLVM (the default is to assume LLVM
+ is built without RTTI, so we don't use it either).
+* Work around CMake bug where on some platforms, CMake doesn't define the
+ 'NDEBUG' when making the 'RelWithDebInfo' target (which is sometimes
+ used for profiling).
+* Docs: Eliminated discussion of random(), which was never implemented
+ and we can't think of a good use case.
+* Add Make/CMake option 'USE_EXTERNAL_PUGIXML' which if set to nonzero
+ will find and use a system-installed PugiXML rather than assuming that
+ it's included in libOpenImageIO. When used, it will also use the
+ environment variable PUGIXML_HOME (if set) as a hint for where to find
+ it, in case it's not in a usual system library directory.
+
+
+
Release 1.3.0 - 14 Feb 2013 (compared to 1.2)
----------------------------------------------
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/doc/osl-languagespec.pdf
===================================================================
(Binary files differ)
Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslconfig.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslconfig.h 2013-06-27 11:10:32 UTC (rev 57817)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslconfig.h 2013-06-27 11:23:44 UTC (rev 57818)
@@ -36,6 +36,11 @@
/// renderer that wanted things a different way.
/////////////////////////////////////////////////////////////////////////
+// Test if we are using C++11
+#if (__cplusplus >= 201103L)
+#define OSL_USING_CPLUSPLUS11 1
+#endif
+
// Symbol export defines
#include "export.h"
@@ -51,6 +56,13 @@
#include <OpenImageIO/typedesc.h>
#include <OpenImageIO/ustring.h>
+// Sort out smart pointers
+#ifdef OSL_USING_CPLUSPLUS11
+# include <memory>
+#else
+# include <boost/shared_ptr.hpp>
+#endif
+
// Extensions to Imath
#include "matrix22.h"
@@ -96,20 +108,14 @@
using OIIO::ustring;
using OIIO::ustringHash;
+// Sort out smart pointers
+#ifdef OSL_USING_CPLUSPLUS11
+ using std::shared_ptr;
+#else
+ using boost::shared_ptr;
+#endif
-
-// These symbols define whether the shading system uses runflags, point
-// indices, or spans. Exactly one should be set to 1!
-// N.B. Spans not fully supported currently.
-#define USE_RUNFLAGS 0
-#define USE_RUNINDICES 0
-#define USE_RUNSPANS 1
-
-
-// Temporary measure to identify the branch with LLVM support. Sorry.
-#define LLVM_SUPPORT 1
-
OSL_NAMESPACE_EXIT
#endif /* OSLCONFIG_H */
Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h 2013-06-27 11:10:32 UTC (rev 57817)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h 2013-06-27 11:23:44 UTC (rev 57818)
@@ -32,7 +32,7 @@
#include "oslconfig.h"
-#include <OpenImageIO/refcnt.h> // just to get shared_ptr from boost ?!
+#include <OpenImageIO/refcnt.h>
#include <OpenImageIO/ustring.h>
Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h 2013-06-27 11:10:32 UTC (rev 57817)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslversion.h 2013-06-27 11:23:44 UTC (rev 57818)
@@ -43,7 +43,7 @@
// Version of this library:
#define OSL_LIBRARY_VERSION_MAJOR 1
#define OSL_LIBRARY_VERSION_MINOR 3
-#define OSL_LIBRARY_VERSION_PATCH 0
+#define OSL_LIBRARY_VERSION_PATCH 2
#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 2013-06-27 11:10:32 UTC (rev 57817)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/emitter.oso 2013-06-27 11:23:44 UTC (rev 57818)
@@ -1,5 +1,5 @@
OpenShadingLanguage 1.00
-# Compiled by oslc 1.3.0
+# Compiled by oslc 1.3.2
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-RB-1.3/src/shaders/emitter.osl:48
+# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3.2/src/shaders/emitter.osl:48
# Ci = (power / surfacearea()) * Cs * emission();
- closure $tmp1 $const1 %filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3/src/shaders/emitter.osl"} %line{48} %argrw{"wr"}
+ closure $tmp1 $const1 %filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3.2/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 2013-06-27 11:10:32 UTC (rev 57817)
+++ trunk/lib/darwin-9.x.universal/osl/shaders/glass.oso 2013-06-27 11:23:44 UTC (rev 57818)
@@ -1,5 +1,5 @@
OpenShadingLanguage 1.00
-# Compiled by oslc 1.3.0
+# Compiled by oslc 1.3.2
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-RB-1.3/src/shaders/glass.osl:56
+# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3.2/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-RB-1.3/src/shaders/glass.osl"} %line{56} %argrw{"wrr"}
+ neq $tmp1 caustics $const1 %filename{"/Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3.2/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-RB-1.3/src/shaders/glass.osl:58
+# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3.2/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-RB-1.3/src/shaders/glass.osl:59
+# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3.2/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-RB-1.3/src/shaders/glass.osl:63
+# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3.2/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-RB-1.3/src/shaders/glass.osl:64
+# /Volumes/Workdata/Blender/Development/lib/darwin-9.x.universal/OpenShadingLanguage-RB-1.3.2/src/shaders/glass.osl:64
# Ci += Ks * reflection(N, 1.0 / eta);
div $tmp13 $const4 eta %line{64} %argrw{"wrr"}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list