[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61494] trunk/lib/windows_vc12/osl/ shaders/ubersurface.oso: Recompile OSL to fix problems caused by recent OpenEXR bump

Martijn Berger martijn.berger at gmail.com
Wed Feb 4 09:24:00 CET 2015 

Revision: 61494
          https://developer.blender.org/rBL61494
Author:   juicyfruit
Date:     2015-02-04 08:23:57 +0000 (Wed, 04 Feb 2015)
Log Message:
-----------
Recompile OSL to fix problems caused by recent OpenEXR bump

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/build.bat
    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/oslversion.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

Property Changed:
----------------
    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/oslversion.h
    trunk/lib/windows_vc12/osl/include/OSL/rendererservices.h
    trunk/lib/windows_vc12/osl/include/OSL/shaderglobals.h
    trunk/lib/windows_vc12/osl/shaders/oslutil.h
    trunk/lib/windows_vc12/osl/shaders/stdosl.h

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/build.bat
===================================================================
--- trunk/lib/windows_vc12/osl/build.bat	2015-02-04 07:08:30 UTC (rev 61493)
+++ trunk/lib/windows_vc12/osl/build.bat	2015-02-04 08:23:57 UTC (rev 61494)
@@ -49,7 +49,7 @@
  -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
  -DBUILDSTATIC=ON ^
  -DOPENIMAGEIOHOME=%LIBDIR%\OpenImageIO ^
- -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO_Util.lib;%LIBDIR%\openimageio\lib\OpenImageIO.lib;%LIBDIR%\png\lib\libpng.lib;%LIBDIR%\jpeg\lib\libjpeg.lib;%LIBDIR%\tiff\lib\libtiff.lib;%LIBDIR%\openexr\lib\Half.lib;%LIBDIR%\openexr\lib\Imath-2_1.lib;%LIBDIR%\openexr\lib\IlmImf-2_1.lib;%LIBDIR%\openexr\lib\Iex-2_1.lib;%LIBDIR%\openexr\lib\IlmThread-2_1.lib ^
+ -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO_Util.lib;%LIBDIR%\openimageio\lib\OpenImageIO.lib;%LIBDIR%\png\lib\libpng.lib;%LIBDIR%\jpeg\lib\libjpeg.lib;%LIBDIR%\tiff\lib\libtiff.lib;%LIBDIR%\openexr\lib\Half.lib;%LIBDIR%\openexr\lib\Imath-2_2.lib;%LIBDIR%\openexr\lib\IlmImf-2_2.lib;%LIBDIR%\openexr\lib\Iex-2_2.lib;%LIBDIR%\openexr\lib\IlmThread-2_2.lib ^
  -DBOOST_ROOT=%LIBDIR%\boost ^
  -DBoost_USE_STATIC_LIBS=ON ^
  -DBoost_USE_STATIC_RUNTIME=ON ^
@@ -58,7 +58,7 @@
  -DFLEX_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_flex.exe ^
  -DBISON_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_bison.exe ^
  -DILMBASE_CUSTOM="ON" ^
- -DILMBASE_CUSTOM_LIBRARIES="Imath-2_1 Half IlmThread-2_1 Iex-2_1" ^
+ -DILMBASE_CUSTOM_LIBRARIES="Imath-2_2 Half IlmThread-2_2 Iex-2_2" ^
  -DILMBASE_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
  -DILMBASE_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
  -DLLVM_DIRECTORY=%LIBDIR%\llvm ^
@@ -67,7 +67,7 @@
  -DLLVM_VERSION=3.4 ^
  -DLLVM_LIBRARY=%LIBDIR%\llvm\lib\LLVMAnalysis.lib;%LIBDIR%\llvm\lib\LLVMAsmParser.lib;%LIBDIR%\llvm\lib\LLVMAsmPrinter.lib;%LIBDIR%\llvm\lib\LLVMBitReader.lib;%LIBDIR%\llvm\lib\LLVMBitWriter.lib;%LIBDIR%\llvm\lib\LLVMCodeGen.lib;%LIBDIR%\llvm\lib\LLVMCore.lib;%LIBDIR%\llvm\lib\LLVMDebugInfo.lib;%LIBDIR%\llvm\lib\LLVMExecutionEngine.lib;%LIBDIR%\llvm\lib\LLVMInstCombine.lib;%LIBDIR%\llvm\lib\LLVMInstrumentation.lib;%LIBDIR%\llvm\lib\LLVMInterpreter.lib;%LIBDIR%\llvm\lib\LLVMJIT.lib;%LIBDIR%\llvm\lib\LLVMLinker.lib;%LIBDIR%\llvm\lib\LLVMMC.lib;%LIBDIR%\llvm\lib\LLVMMCDisassembler.lib;%LIBDIR%\llvm\lib\LLVMMCJIT.lib;%LIBDIR%\llvm\lib\LLVMMCParser.lib;%LIBDIR%\llvm\lib\LLVMObject.lib;%LIBDIR%\llvm\lib\LLVMRuntimeDyld.lib;%LIBDIR%\llvm\lib\LLVMScalarOpts.lib;%LIBDIR%\llvm\lib\LLVMSelectionDAG.lib;%LIBDIR%\llvm\lib\LLVMSupport.lib;%LIBDIR%\llvm\lib\LLVMTableGen.lib;%LIBDIR%\llvm\lib\LLVMTarget.lib;%LIBDIR%\llvm\lib\LLVMTransformUtils.lib;%LIBDIR%\llvm\lib\LLVMVectorize.lib;%LIBDIR%\llvm\
 lib\LLVMX86AsmParser.lib;%LIBDIR%\llvm\lib\LLVMX86AsmPrinter.lib;%LIBDIR%\llvm\lib\LLVMX86CodeGen.lib;%LIBDIR%\llvm\lib\LLVMX86Desc.lib;%LIBDIR%\llvm\lib\LLVMX86Disassembler.lib;%LIBDIR%\llvm\lib\LLVMX86Info.lib;%LIBDIR%\llvm\lib\LLVMX86Utils.lib;%LIBDIR%\llvm\lib\LLVMipa.lib;%LIBDIR%\llvm\lib\LLVMipo.lib ^
  -DILMBASE_HOME=%LIBDIR%\openexr ^
- -DILMBASE_VERSION=2_1 ^
+ -DILMBASE_VERSION=2_2 ^
  -DCMAKE_BUILD_TYPE=Release
 
 nmake install
@@ -83,18 +83,22 @@
 cd build\windows_debug
 
 cmake -G "NMake Makefiles" ..\..\ ^
- -DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl ^
- -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1" ^
- -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG" ^
- -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG" ^
- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG" ^
+ -DCMAKE_INSTALL_PREFIX=%LIBDIR%\osl\debug ^
+ -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /DPSAPI_VERSION=1 /RTC1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS" ^
+ -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS" ^
+ -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS" ^
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DPSAPI_VERSION=1 /D NDEBUG /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS" ^
  -DCMAKE_CXX_STANDARD_LIBRARIES:STRING="kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib psapi.lib" ^
  -DBUILDSTATIC=ON ^
  -DOPENIMAGEIOHOME=%LIBDIR%\OpenImageIO ^
- -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO_d.lib;%LIBDIR%\openimageio\lib\OpenImageIO_Util_d.lib;%LIBDIR%\png\lib\libpng16.lib;%LIBDIR%\jpeg\lib\libjpeg.lib;%LIBDIR%\tiff\lib\libtiff.lib;%LIBDIR%\openexr\lib\Half_d.lib;%LIBDIR%\openexr\lib\Imath-2_1_d.lib;%LIBDIR%\openexr\lib\IlmImf-2_1_d.lib;%LIBDIR%\openexr\lib\Iex-2_1_d.lib;%LIBDIR%\openexr\lib\IlmThread-2_1_d.lib ^
+ -DOPENIMAGEIO_LIBRARY=%LIBDIR%\openimageio\lib\OpenImageIO_d.lib;%LIBDIR%\openimageio\lib\OpenImageIO_Util_d.lib;%LIBDIR%\png\lib\libpng.lib;%LIBDIR%\jpeg\lib\libjpeg.lib;%LIBDIR%\tiff\lib\libtiff.lib;%LIBDIR%\openexr\lib\Half_d.lib;%LIBDIR%\openexr\lib\Imath-2_2_d.lib;%LIBDIR%\openexr\lib\IlmImf-2_2_d.lib;%LIBDIR%\openexr\lib\Iex-2_2_d.lib;%LIBDIR%\openexr\lib\IlmThread-2_2_d.lib ^
  -DBOOST_ROOT=%LIBDIR%\boost ^
  -DBoost_USE_STATIC_LIBS=ON ^
  -DBoost_USE_STATIC_RUNTIME=ON ^
+ -DILMBASE_CUSTOM="ON" ^
+ -DILMBASE_CUSTOM_LIBRARIES="Imath-2_2_d Half_d IlmThread-2_2_d Iex-2_2_d" ^
+ -DILMBASE_CUSTOM_INCLUDE_DIR=%LIBDIR%\openexr\include ^
+ -DILMBASE_CUSTOM_LIB_DIR=%LIBDIR%\openexr\lib ^
  -DZLIB_INCLUDE_DIR=%LIBDIR%\zlib\include ^
  -DZLIB_LIBRARY=%LIBDIR%\zlib\lib\libz_st.lib ^
  -DFLEX_EXECUTABLE=%LIBDIR%\osl\flex_bison\bin\win_flex.exe ^
@@ -103,10 +107,10 @@
  -DLLVM_INCLUDES=%LIBDIR%\llvm\include ^
  -DLLVM_LIB_DIR=%LIBDIR%\llvm\debug\lib ^
  -DLLVM_VERSION=3.4 ^
-  -DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
+ -DCMAKE_DEBUG_POSTFIX:STRING="_d" ^
  -DLLVM_LIBRARY=%LIBDIR%\llvm\debug\lib\LLVMAnalysis.lib;%LIBDIR%\llvm\debug\lib\LLVMAsmParser.lib;%LIBDIR%\llvm\debug\lib\LLVMAsmPrinter.lib;%LIBDIR%\llvm\debug\lib\LLVMBitReader.lib;%LIBDIR%\llvm\debug\lib\LLVMBitWriter.lib;%LIBDIR%\llvm\debug\lib\LLVMCodeGen.lib;%LIBDIR%\llvm\debug\lib\LLVMCore.lib;%LIBDIR%\llvm\debug\lib\LLVMDebugInfo.lib;%LIBDIR%\llvm\debug\lib\LLVMExecutionEngine.lib;%LIBDIR%\llvm\debug\lib\LLVMInstCombine.lib;%LIBDIR%\llvm\debug\lib\LLVMInstrumentation.lib;%LIBDIR%\llvm\debug\lib\LLVMInterpreter.lib;%LIBDIR%\llvm\debug\lib\LLVMJIT.lib;%LIBDIR%\llvm\debug\lib\LLVMLinker.lib;%LIBDIR%\llvm\debug\lib\LLVMMC.lib;%LIBDIR%\llvm\debug\lib\LLVMMCDisassembler.lib;%LIBDIR%\llvm\debug\lib\LLVMMCJIT.lib;%LIBDIR%\llvm\debug\lib\LLVMMCParser.lib;%LIBDIR%\llvm\debug\lib\LLVMObject.lib;%LIBDIR%\llvm\debug\lib\LLVMRuntimeDyld.lib;%LIBDIR%\llvm\debug\lib\LLVMScalarOpts.lib;%LIBDIR%\llvm\debug\lib\LLVMSelectionDAG.lib;%LIBDIR%\llvm\debug\lib\LLVMSupport.lib;%LIBDIR%\llvm\debug\l
 ib\LLVMTableGen.lib;%LIBDIR%\llvm\debug\lib\LLVMTarget.lib;%LIBDIR%\llvm\debug\lib\LLVMTransformUtils.lib;%LIBDIR%\llvm\debug\lib\LLVMVectorize.lib;%LIBDIR%\llvm\debug\lib\LLVMX86AsmParser.lib;%LIBDIR%\llvm\debug\lib\LLVMX86AsmPrinter.lib;%LIBDIR%\llvm\debug\lib\LLVMX86CodeGen.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Desc.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Disassembler.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Info.lib;%LIBDIR%\llvm\debug\lib\LLVMX86Utils.lib;%LIBDIR%\llvm\debug\lib\LLVMipa.lib;%LIBDIR%\llvm\debug\lib\LLVMipo.lib ^
  -DILMBASE_HOME=%LIBDIR%\openexr ^
- -DILMBASE_VERSION=2_1 ^
+ -DILMBASE_VERSION=2_2 ^
  -DCMAKE_BUILD_TYPE=Debug
 
 nmake install

Modified: trunk/lib/windows_vc12/osl/include/OSL/Imathx.h
===================================================================
--- trunk/lib/windows_vc12/osl/include/OSL/Imathx.h	2015-02-04 07:08:30 UTC (rev 61493)
+++ trunk/lib/windows_vc12/osl/include/OSL/Imathx.h	2015-02-04 08:23:57 UTC (rev 61494)
@@ -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.
-// 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list