[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61453] trunk/lib/windows_vc12/osl: OSL 1.5.11 + sergey alignment fix msvc 2013 x86 v120_xp

Martijn Berger martijn.berger at gmail.com
Mon Nov 24 22:14:43 CET 2014


Revision: 61453
          https://developer.blender.org/rBL61453
Author:   juicyfruit
Date:     2014-11-24 21:14:42 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
OSL 1.5.11 + sergey alignment fix msvc 2013 x86 v120_xp

Modified Paths:
--------------
    trunk/lib/windows_vc12/osl/include/OSL/oslexec.h
    trunk/lib/windows_vc12/osl/include/OSL/oslversion.h
    trunk/lib/windows_vc12/osl/lib/libtestshade.lib
    trunk/lib/windows_vc12/osl/lib/oslcomp.lib
    trunk/lib/windows_vc12/osl/lib/oslexec.lib
    trunk/lib/windows_vc12/osl/lib/oslquery.lib

Modified: trunk/lib/windows_vc12/osl/include/OSL/oslexec.h
===================================================================
--- trunk/lib/windows_vc12/osl/include/OSL/oslexec.h	2014-11-24 20:40:07 UTC (rev 61452)
+++ trunk/lib/windows_vc12/osl/include/OSL/oslexec.h	2014-11-24 21:14:42 UTC (rev 61453)
@@ -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.
@@ -418,7 +418,8 @@
     std::string getstats (int level=1) const;
 
     void register_closure (string_view name, int id, const ClosureParam *params,
-                           PrepareClosureFunc prepare, SetupClosureFunc setup);
+                           PrepareClosureFunc prepare, SetupClosureFunc setup,
+						   int alignment = 1);
     /// Query either by name or id an existing closure. If name is non
     /// NULL it will use it for the search, otherwise id would be used
     /// and the name will be placed in name if successful. Also return

Modified: trunk/lib/windows_vc12/osl/include/OSL/oslversion.h
===================================================================
--- trunk/lib/windows_vc12/osl/include/OSL/oslversion.h	2014-11-24 20:40:07 UTC (rev 61452)
+++ trunk/lib/windows_vc12/osl/include/OSL/oslversion.h	2014-11-24 21:14:42 UTC (rev 61453)
@@ -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/windows_vc12/osl/lib/libtestshade.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/lib/oslcomp.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/lib/oslexec.lib
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/lib/oslquery.lib
===================================================================
(Binary files differ)




More information about the Bf-blender-cvs mailing list