Revision: 57675
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57675
Author: shadowrom
Date: 2013-06-23 19:07:46 +0000 (Sun, 23 Jun 2013)
Log Message:
-----------
prevent cycles sm_35 kernel to be built on win32 with vs2012 because of ptxas
crashes.
Workaround to keep buildbot running.
I filed a bug report to NVidia, will remove this as soon as the problem is
fixed.
Modified Paths:
--------------
trunk/blender/build_files/scons/config/win32-vc-config.py
Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py 2013-06-23
19:04:12 UTC (rev 57674)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py 2013-06-23
19:07:46 UTC (rev 57675)
@@ -215,8 +215,13 @@
#CUDA
WITH_BF_CYCLES_CUDA_BINARIES = False
#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
+# Workaround for ptxas.exe crash on VS2012 and cuda 5.5
+if VC_VERSION == '11.0':
+ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+else:
+ BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35']
+
#Ray trace optimization
WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
