[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42330] branches/bmesh/blender: svn merge ^/trunk/blender -r42303:42329
Campbell Barton
ideasman42 at gmail.com
Fri Dec 2 02:01:12 CET 2011
Revision: 42330
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42330
Author: campbellbarton
Date: 2011-12-02 01:01:07 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42303:42329
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42303
Modified Paths:
--------------
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/scons/config/darwin-config.py
branches/bmesh/blender/build_files/scons/config/linux-config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/extern/libmv/CMakeLists.txt
branches/bmesh/blender/extern/libmv/bundle.sh
branches/bmesh/blender/intern/cycles/CMakeLists.txt
branches/bmesh/blender/intern/cycles/SConscript
branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp
branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt
branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
branches/bmesh/blender/intern/cycles/blender/addon/enums.py
branches/bmesh/blender/intern/cycles/blender/addon/properties.py
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp
branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.h
branches/bmesh/blender/intern/cycles/device/device_cuda.cpp
branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/svm/svm.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h
branches/bmesh/blender/intern/cycles/render/nodes.cpp
branches/bmesh/blender/intern/cycles/render/nodes.h
branches/bmesh/blender/release/scripts/startup/keyingsets_builtins.py
branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh_validate.c
branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
branches/bmesh/blender/source/blender/makesdna/intern/dna_genfile.c
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_internal_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_rna.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
Added Paths:
-----------
branches/bmesh/blender/intern/cycles/kernel/SConscript
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
branches/bmesh/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
Removed Paths:
-------------
branches/bmesh/blender/intern/cycles/blender/addon/xml.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42303
+ /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42329
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/SConstruct 2011-12-02 01:01:07 UTC (rev 42330)
@@ -581,6 +581,14 @@
source.remove('CMakeLists.txt')
source=['intern/cycles/doc/license/'+s for s in source]
scriptinstall.append(env.Install(dir=dir,source=source))
+
+ # cuda binaries
+ if env['WITH_BF_CYCLES_CUDA_BINARIES']:
+ dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'lib')
+ for arch in env['BF_CYCLES_CUDA_BINARIES_ARCH']:
+ kernel_build_dir = os.path.join(B.root_build_dir, 'intern/cycles/kernel')
+ cubin_file = os.path.join(kernel_build_dir, "kernel_%s.cubin" % arch)
+ scriptinstall.append(env.Install(dir=dir,source=cubin_file))
if env['WITH_BF_INTERNATIONAL']:
internationalpaths=['release' + os.sep + 'datafiles']
Modified: branches/bmesh/blender/build_files/scons/config/darwin-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/darwin-config.py 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/build_files/scons/config/darwin-config.py 2011-12-02 01:01:07 UTC (rev 42330)
@@ -283,7 +283,7 @@
#BF_EXPAT_LIB = 'expat'
#BF_EXPAT_LIBPATH = '/usr/lib'
-#Cycles
+# Cycles
WITH_BF_CYCLES = True
WITH_BF_OIIO = True
@@ -298,6 +298,10 @@
BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt'
BF_BOOST_LIBPATH = BF_BOOST + '/lib'
+WITH_BF_CYCLES_CUDA_BINARIES = False
+BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
#Ray trace optimization
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/bmesh/blender/build_files/scons/config/linux-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/linux-config.py 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/build_files/scons/config/linux-config.py 2011-12-02 01:01:07 UTC (rev 42330)
@@ -219,6 +219,10 @@
WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST
+WITH_BF_CYCLES_CUDA_BINARIES = False
+BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+
WITH_BF_OPENMP = True
#Ray trace optimization
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-12-02 01:01:07 UTC (rev 42330)
@@ -291,7 +291,7 @@
syslibs += Split(lenv['BF_JPEG_LIB'])
syslibs += Split(lenv['BF_PNG_LIB'])
-
+
syslibs += lenv['LLIBS']
return syslibs
@@ -588,6 +588,8 @@
commands.getoutput(cmd)
cmd = 'mkdir %s/kernel' % (cinstalldir)
commands.getoutput(cmd)
+ cmd = 'mkdir %s/lib' % (cinstalldir)
+ commands.getoutput(cmd)
cmd = 'cp -R %s/blender/addon/*.py %s/' % (croot, cinstalldir)
commands.getoutput(cmd)
cmd = 'cp -R %s/doc/license %s/license' % (croot, cinstalldir)
@@ -596,6 +598,8 @@
commands.getoutput(cmd)
cmd = 'cp -R %s/kernel/svm %s/util/util_color.h %s/util/util_math.h %s/util/util_transform.h %s/util/util_types.h %s/kernel/' % (croot, croot, croot, croot, croot, cinstalldir)
commands.getoutput(cmd)
+ cmd = 'cp -R %s/../intern/cycles/kernel/*.cubin %s/lib/' % (builddir, cinstalldir)
+ commands.getoutput(cmd)
if env['WITH_OSX_STATICPYTHON']:
cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py 2011-12-02 01:01:07 UTC (rev 42330)
@@ -157,7 +157,7 @@
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC',
'BUILDBOT_BRANCH',
'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
- 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_BINARIES' 'BF_CYCLES_BINARIES_ARCH',
+ 'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC',
'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH'
]
@@ -544,7 +544,9 @@
localopts.AddVariables(
(BoolVariable('WITH_BF_CYCLES', 'Build with the Cycles engine', True)),
- (BoolVariable('WITH_BF_CYCLES_BINARIES', 'Build with precompiled CUDA binaries', False)),
+ (BoolVariable('WITH_BF_CYCLES_CUDA_BINARIES', 'Build with precompiled CUDA binaries', False)),
+ ('BF_CYCLES_CUDA_NVCC', 'CUDA nvcc compiler path', ''),
+ ('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
(BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
(BoolVariable('WITH_BF_STATICOIIO', 'Staticly link to OpenImageIO', False)),
Modified: branches/bmesh/blender/extern/libmv/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/libmv/CMakeLists.txt 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/extern/libmv/CMakeLists.txt 2011-12-02 01:01:07 UTC (rev 42330)
@@ -175,9 +175,9 @@
if(MSVC)
set(MSVC_OFLAGS O1 O2 Ox)
- foreach(FLAG )
- string(REPLACE "" "Od" CMAKE_CXX_FLAGS_RELEASE "")
- string(REPLACE "" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "")
+ foreach(FLAG ${MSVC_OFLAGS})
+ string(REPLACE "${FLAG}" "Od" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+ string(REPLACE "${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endforeach()
endif()
else(WIN32)
Modified: branches/bmesh/blender/extern/libmv/bundle.sh
===================================================================
--- branches/bmesh/blender/extern/libmv/bundle.sh 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/extern/libmv/bundle.sh 2011-12-02 01:01:07 UTC (rev 42330)
@@ -183,9 +183,9 @@
IF(MSVC)
set(MSVC_OFLAGS O1 O2 Ox)
- foreach(FLAG ${MSVC_OFLAGS})
- string(REPLACE "${FLAG}" "Od" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
- string(REPLACE "${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+ foreach(FLAG \${MSVC_OFLAGS})
+ string(REPLACE "\${FLAG}" "Od" CMAKE_CXX_FLAGS_RELEASE "\${CMAKE_CXX_FLAGS_RELEASE}")
+ string(REPLACE "\${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "\${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endforeach()
ENDIF(MSVC)
ELSE(WIN32)
Modified: branches/bmesh/blender/intern/cycles/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/CMakeLists.txt 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/intern/cycles/CMakeLists.txt 2011-12-02 01:01:07 UTC (rev 42330)
@@ -10,12 +10,14 @@
if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
set(WITH_CYCLES_OPTIMIZED_KERNEL ON)
+endif()
- if(WIN32 AND MSVC)
- set(CYCLES_OPTIMIZED_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast")
- elseif(CMAKE_COMPILER_IS_GNUCC)
- set(CYCLES_OPTIMIZED_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3")
- endif()
+if(WIN32 AND MSVC)
+ set(CYCLES_OPTIMIZED_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /EHsc")
+elseif(CMAKE_COMPILER_IS_GNUCC)
+ set(CYCLES_OPTIMIZED_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
endif()
# for OSL, not needed yet
Modified: branches/bmesh/blender/intern/cycles/SConscript
===================================================================
--- branches/bmesh/blender/intern/cycles/SConscript 2011-12-01 22:10:10 UTC (rev 42329)
+++ branches/bmesh/blender/intern/cycles/SConscript 2011-12-02 01:01:07 UTC (rev 42330)
@@ -14,6 +14,7 @@
incs = []
defs = []
+cxxflags = []
defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
defs.append('CCL_NAMESPACE_END=}')
@@ -22,7 +23,7 @@
defs.append('WITH_MULTI')
defs.append('WITH_CUDA')
-if env['WITH_BF_CYCLES_BINARIES']:
+if env['WITH_BF_CYCLES_CUDA_BINARIES']:
defs.append('WITH_CUDA_BINARIES')
incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
@@ -33,12 +34,17 @@
incs.append(cycles['BF_BOOST_INC'])
incs.append(cycles['BF_PYTHON_INC'])
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
+else:
+ cxxflags.append('-ffast-math'.split())
+
# optimized kernel
if env['WITH_BF_RAYOPTIMIZATION']:
optim_cxxflags = []
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- optim_cxxflags.append('/Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast'.split())
+ optim_cxxflags.append('/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
else:
optim_cxxflags.append('-ffast-math -msse -msse2 -msse3'.split())
@@ -48,5 +54,10 @@
cycles_optim = cycles.Clone()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list