[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61470] trunk/lib/windows_vc12/osl: Win32, VC12: Update OSL to version from our fork repository

Sergey Sharybin sergey.vfx at gmail.com
Tue Jan 6 19:54:01 CET 2015


Revision: 61470
          https://developer.blender.org/rBL61470
Author:   sergey
Date:     2015-01-06 18:53:56 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
Win32, VC12: Update OSL to version from our fork repository

This makes it consistent to all the platforms, plus it seems to solve crashes here
(which are originally reported in T43096).

Modified Paths:
--------------
    trunk/lib/windows_vc12/osl/bin/oslc.exe
    trunk/lib/windows_vc12/osl/bin/oslinfo.exe
    trunk/lib/windows_vc12/osl/bin/testrender.exe
    trunk/lib/windows_vc12/osl/bin/testshade.exe
    trunk/lib/windows_vc12/osl/bin/testshade_dso.exe
    trunk/lib/windows_vc12/osl/include/OSL/Imathx.h
    trunk/lib/windows_vc12/osl/include/OSL/accum.h
    trunk/lib/windows_vc12/osl/include/OSL/dual.h
    trunk/lib/windows_vc12/osl/include/OSL/dual_vec.h
    trunk/lib/windows_vc12/osl/include/OSL/export.h
    trunk/lib/windows_vc12/osl/include/OSL/genclosure.h
    trunk/lib/windows_vc12/osl/include/OSL/llvm_util.h
    trunk/lib/windows_vc12/osl/include/OSL/matrix22.h
    trunk/lib/windows_vc12/osl/include/OSL/optautomata.h
    trunk/lib/windows_vc12/osl/include/OSL/oslclosure.h
    trunk/lib/windows_vc12/osl/include/OSL/oslcomp.h
    trunk/lib/windows_vc12/osl/include/OSL/oslconfig.h
    trunk/lib/windows_vc12/osl/include/OSL/oslexec.h
    trunk/lib/windows_vc12/osl/include/OSL/oslquery.h
    trunk/lib/windows_vc12/osl/include/OSL/rendererservices.h
    trunk/lib/windows_vc12/osl/include/OSL/shaderglobals.h
    trunk/lib/windows_vc12/osl/lib/libtestshade.lib
    trunk/lib/windows_vc12/osl/lib/libtestshade_d.lib
    trunk/lib/windows_vc12/osl/lib/oslcomp.lib
    trunk/lib/windows_vc12/osl/lib/oslcomp_d.lib
    trunk/lib/windows_vc12/osl/lib/oslexec.lib
    trunk/lib/windows_vc12/osl/lib/oslexec_d.lib
    trunk/lib/windows_vc12/osl/lib/oslquery.lib
    trunk/lib/windows_vc12/osl/lib/oslquery_d.lib
    trunk/lib/windows_vc12/osl/shaders/emitter.osl
    trunk/lib/windows_vc12/osl/shaders/emitter.oso
    trunk/lib/windows_vc12/osl/shaders/glass.osl
    trunk/lib/windows_vc12/osl/shaders/glass.oso
    trunk/lib/windows_vc12/osl/shaders/image.osl
    trunk/lib/windows_vc12/osl/shaders/image.oso
    trunk/lib/windows_vc12/osl/shaders/matte.osl
    trunk/lib/windows_vc12/osl/shaders/matte.oso
    trunk/lib/windows_vc12/osl/shaders/metal.osl
    trunk/lib/windows_vc12/osl/shaders/metal.oso
    trunk/lib/windows_vc12/osl/shaders/oslutil.h
    trunk/lib/windows_vc12/osl/shaders/stdosl.h
    trunk/lib/windows_vc12/osl/shaders/ubersurface.osl
    trunk/lib/windows_vc12/osl/shaders/ubersurface.oso

Modified: trunk/lib/windows_vc12/osl/bin/oslc.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/bin/oslinfo.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/bin/testrender.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/bin/testshade.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/bin/testshade_dso.exe
===================================================================
(Binary files differ)

Modified: trunk/lib/windows_vc12/osl/include/OSL/Imathx.h
===================================================================
--- trunk/lib/windows_vc12/osl/include/OSL/Imathx.h	2015-01-06 16:06:48 UTC (rev 61469)
+++ trunk/lib/windows_vc12/osl/include/OSL/Imathx.h	2015-01-06 18:53:56 UTC (rev 61470)
@@ -1,95 +1,95 @@
-/*
-Copyright (c) 2012 Sony Pictures Imageworks Inc., et al.
-and
-All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-* Neither the name of Sony Pictures Imageworks nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-// Extensions to Imath classes for use in OSL's internals.
-// 
-// The original Imath classes bear the "new BSD" license (same as
-// ours above) and this copyright:
-// Copyright (c) 2002, Industrial Light & Magic, a division of
-// Lucas Digital Ltd. LLC.  All rights reserved.
-
-
-#pragma once
-
-#include <OpenEXR/ImathVec.h>
-#include <OpenEXR/ImathMatrix.h>
-#include <OpenEXR/ImathColor.h>
-
-#include "matrix22.h"
-
-
-OSL_NAMESPACE_ENTER
-
-
-/// 3x3 matrix transforming a 3-vector.  This is curiously not supplied
-/// by Imath, so we define it ourselves.
-template <class S, class T>
-inline void
-multMatrix (const Imath::Matrix33<T> &M, const Imath::Vec3<S> &src,
-            Imath::Vec3<S> &dst)
-{
-    S a = src[0] * M[0][0] + src[1] * M[1][0] + src[2] * M[2][0];
-    S b = src[0] * M[0][1] + src[1] * M[1][1] + src[2] * M[2][1];
-    S c = src[0] * M[0][2] + src[1] * M[1][2] + src[2] * M[2][2];
-    dst[0] = a;
-    dst[1] = b;
-    dst[2] = c;
-}
-
-
-/// Express dot product as a function rather than a method.
-template<class T>
-inline T
-dot (const Imath::Vec2<T> &a, const Imath::Vec2<T> &b)
-{
-    return a.dot (b);
-}
-
-
-/// Express dot product as a function rather than a method.
-template<class T>
-inline T
-dot (const Imath::Vec3<T> &a, const Imath::Vec3<T> &b)
-{
-    return a.dot (b);
-}
-
-
-
-/// Return the determinant of a 2x2 matrix.
-template <class T>
-inline
-T determinant (const Imathx::Matrix22<T> &m)
-{
-    return m[0][0]*m[1][1] - m[0][1]*m[1][0];
-}
-
-
-OSL_NAMESPACE_EXIT
+/*
+Copyright (c) 2012 Sony Pictures Imageworks Inc., et al.
+and
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+// Extensions to Imath classes for use in OSL's internals.
+// 
+// The original Imath classes bear the "new BSD" license (same as
+// ours above) and this copyright:
+// Copyright (c) 2002, Industrial Light & Magic, a division of
+// Lucas Digital Ltd. LLC.  All rights reserved.
+
+
+#pragma once
+
+#include <OpenEXR/ImathVec.h>
+#include <OpenEXR/ImathMatrix.h>
+#include <OpenEXR/ImathColor.h>
+
+#include "matrix22.h"
+
+
+OSL_NAMESPACE_ENTER
+
+
+/// 3x3 matrix transforming a 3-vector.  This is curiously not supplied
+/// by Imath, so we define it ourselves.
+template <class S, class T>
+inline void
+multMatrix (const Imath::Matrix33<T> &M, const Imath::Vec3<S> &src,
+            Imath::Vec3<S> &dst)
+{
+    S a = src[0] * M[0][0] + src[1] * M[1][0] + src[2] * M[2][0];
+    S b = src[0] * M[0][1] + src[1] * M[1][1] + src[2] * M[2][1];
+    S c = src[0] * M[0][2] + src[1] * M[1][2] + src[2] * M[2][2];
+    dst[0] = a;
+    dst[1] = b;
+    dst[2] = c;
+}
+
+
+/// Express dot product as a function rather than a method.
+template<class T>
+inline T
+dot (const Imath::Vec2<T> &a, const Imath::Vec2<T> &b)
+{
+    return a.dot (b);
+}
+
+
+/// Express dot product as a function rather than a method.
+template<class T>
+inline T
+dot (const Imath::Vec3<T> &a, const Imath::Vec3<T> &b)
+{
+    return a.dot (b);
+}
+
+
+
+/// Return the determinant of a 2x2 matrix.
+template <class T>
+inline
+T determinant (const Imathx::Matrix22<T> &m)
+{
+    return m[0][0]*m[1][1] - m[0][1]*m[1][0];
+}
+
+
+OSL_NAMESPACE_EXIT

Modified: trunk/lib/windows_vc12/osl/include/OSL/accum.h
===================================================================
--- trunk/lib/windows_vc12/osl/include/OSL/accum.h	2015-01-06 16:06:48 UTC (rev 61469)
+++ trunk/lib/windows_vc12/osl/include/OSL/accum.h	2015-01-06 18:53:56 UTC (rev 61470)
@@ -1,246 +1,246 @@
-/*
-Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
-All Rights Reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-* Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-* Neither the name of Sony Pictures Imageworks nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#pragma once
-
-#include "oslconfig.h"
-#include "optautomata.h"
-#include <list>
-#include <stack>
-
-OSL_NAMESPACE_ENTER
-
-class Aov
-{
-    public:
-        virtual void write(void *flush_data, Color3 &color, float alpha,
-                           bool has_color, bool has_alpha) = 0;
-};
-
-/// AOV slot where the integrator will write to
-///
-/// This is the end point of the output before going to
-/// the AOV. These objects are owned by the Accumulator
-/// class and there is going to be exactly one for each
-/// active AOV. These objects should be reset before the
-/// integration ray walk for a pixel and flushed at the end
-struct AovOutput
-{
-    AovOutput():neg_color(false),neg_alpha(false),aov(NULL) {};
-
-    // Accumulated values
-    Color3      color;
-    float       alpha;
-    // whether there has been some value added to color
-    bool    has_color;
-    // whether there has been some value added to alpha
-    bool    has_alpha;
-    // It is also possible to "invert" values before flushing
-    bool    neg_color;
-    bool    neg_alpha;
-    // The abstract AOV to send the data to
-    Aov          *aov;
-
-    // Reset the accumulated value to start a new integration
-    void reset()
-    {
-        color.setValue(0, 0, 0);
-        alpha = 0.0f;
-        has_alpha = has_color = false;
-    };
-    /// Sends the color information to the AOV
-    void flush(void *flush_data);
-};
-
-
-

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list