[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51847] trunk/lib/darwin-9.x.universal/osl : OSX/OSL: renew libs to newest adaptions (blender-fixes-branch)

[jens verwiebe]

Revision: 51847
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51847
Author:   jensverwiebe
Date:     2012-11-03 20:34:52 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
OSX/OSL: renew libs to newest adaptions (blender-fixes-branch)

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/osl/bin/oslc
    trunk/lib/darwin-9.x.universal/osl/include/OSL/oslcomp.h
    trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.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

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

Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslcomp.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslcomp.h	2012-11-03 18:52:44 UTC (rev 51846)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslcomp.h	2012-11-03 20:34:52 UTC (rev 51847)
@@ -44,7 +44,8 @@
     /// Compile the given file, using the list of command-line options.
     /// Return true if ok, false if the compile failed.
     virtual bool compile (const std::string &filename,
-                          const std::vector<std::string> &options) = 0;
+                          const std::vector<std::string> &options,
+                          const std::string &stdoslpath = "") = 0;
 
     /// Return the name of our compiled output (must be called after
     /// compile()).

Modified: trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h	2012-11-03 18:52:44 UTC (rev 51846)
+++ trunk/lib/darwin-9.x.universal/osl/include/OSL/oslexec.h	2012-11-03 20:34:52 UTC (rev 51847)
@@ -167,6 +167,11 @@
     ///
     virtual bool ConnectShaders (const char *srclayer, const char *srcparam,
                                  const char *dstlayer, const char *dstparam)=0;
+    
+    // Load OSO data from memory buffer, overriding shader lookups in the
+    // shader search path
+    virtual bool LoadMemoryShader (const char *shadername,
+                                   const char *buffer)=0;
 
     /// Return a reference-counted (but opaque) reference to the current
     /// shading attribute state maintained by the ShadingSystem.
@@ -482,19 +487,19 @@
                                    void *data);
 
 
-    /// Lookup nearest points in a point cloud. It will search for points
-    /// around the given center within the specified radius. A list of indices
-    /// is returned so the programmer can later retrieve attributes with
-    /// pointcloud_get. The indices array is mandatory, but distances can be NULL.
-    /// If a derivs_offset > 0 is given, derivatives will be computed for
-    /// distances (when provided).
+    /// Lookup nearest points in a point cloud. It will search for
+    /// points around the given center within the specified radius. A
+    /// list of indices is returned so the programmer can later retrieve
+    /// attributes with pointcloud_get. The indices array is mandatory,
+    /// but distances can be NULL.  If a derivs_offset > 0 is given,
+    /// derivatives will be computed for distances (when provided).
     ///
     /// Return the number of points found, always < max_points
     virtual int pointcloud_search (ShaderGlobals *sg,
                                    ustring filename, const OSL::Vec3 &center,
                                    float radius, int max_points, bool sort,
                                    size_t *out_indices,
-                                   float *out_distances, int derivs_offset) = 0;
+                                   float *out_distances, int derivs_offset);
 
     /// Retrieve an attribute for an index list. The result is another array
     /// of the requested type stored in out_data.
@@ -502,8 +507,17 @@
     /// Return 1 if the attribute is found, 0 otherwise.
     virtual int pointcloud_get (ustring filename, size_t *indices, int count,
                                 ustring attr_name, TypeDesc attr_type,
-                                void *out_data) = 0;
+                                void *out_data);
 
+    /// Write a point to the named pointcloud, which will be saved 
+    /// at the end of the frame.  Return true if everything is ok,
+    /// false if there was an error.
+    virtual bool pointcloud_write (ShaderGlobals *sg,
+                                   ustring filename, const OSL::Vec3 &pos,
+                                   int nattribs, const ustring *names,
+                                   const TypeDesc *types,
+                                   const void **data);
+
     /// Options for the trace call.
     struct TraceOpt {
         float mindist;    ///< ignore hits closer than this

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)