[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42315] trunk/blender/intern/cycles: Cycles: forgot to include file in last commit, and add / EHsc flag back on windows,

[Brecht Van Lommel]

Revision: 42315
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42315
Author:   blendix
Date:     2011-12-01 17:07:49 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Cycles: forgot to include file in last commit, and add /EHsc flag back on windows,
thought it wasn't needed but it is.

Modified Paths:
--------------
    trunk/blender/intern/cycles/CMakeLists.txt
    trunk/blender/intern/cycles/SConscript

Added Paths:
-----------
    trunk/blender/intern/cycles/kernel/SConscript

Removed Paths:
-------------
    trunk/blender/intern/cycles/blender/addon/xml.py

Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt	2011-12-01 16:33:21 UTC (rev 42314)
+++ trunk/blender/intern/cycles/CMakeLists.txt	2011-12-01 17:07:49 UTC (rev 42315)
@@ -13,8 +13,8 @@
 endif()
 
 if(WIN32 AND MSVC)
-	set(CYCLES_OPTIMIZED_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS")
+	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")

Modified: trunk/blender/intern/cycles/SConscript
===================================================================
--- trunk/blender/intern/cycles/SConscript	2011-12-01 16:33:21 UTC (rev 42314)
+++ trunk/blender/intern/cycles/SConscript	2011-12-01 17:07:49 UTC (rev 42315)
@@ -35,7 +35,7 @@
 incs.append(cycles['BF_PYTHON_INC'])
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-    cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast'.split())
+    cxxflags.append('-D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc'.split())
 else:
     cxxflags.append('-ffast-math'.split())
 
@@ -44,7 +44,7 @@
     optim_cxxflags = []
 
     if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
-        optim_cxxflags.append('/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /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())
     

Deleted: trunk/blender/intern/cycles/blender/addon/xml.py
===================================================================
Added: trunk/blender/intern/cycles/kernel/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/SConscript	                        (rev 0)
+++ trunk/blender/intern/cycles/kernel/SConscript	2011-12-01 17:07:49 UTC (rev 42315)
@@ -0,0 +1,50 @@
+#!/usr/bin/python
+import sys
+import os
+
+def normpath(path):
+    return os.path.abspath(os.path.normpath(path))
+
+Import ('env')
+
+kernel_binaries = []
+
+if env['WITH_BF_CYCLES_CUDA_BINARIES']:
+    kernel = env.Clone()
+
+    # cuda info
+    nvcc = env['BF_CYCLES_CUDA_NVCC']
+    cuda_archs = env['BF_CYCLES_CUDA_BINARIES_ARCH']
+
+    # build directory
+    root_build_dir = normpath(env['BF_BUILDDIR'])
+    build_dir = os.path.join(root_build_dir, 'intern/cycles/kernel')
+
+    # source directories and files
+    source_dir = Dir('.').srcnode().path
+    kernel_file = os.path.join(source_dir, "kernel.cu")
+    util_dir = os.path.join(source_dir, "../util")
+    svm_dir = os.path.join(source_dir, "../svm")
+
+    # nvcc flags
+    nvcc_flags = "--cubin -use_fast_math --ptxas-options=\"-v\" --maxrregcount=24"
+    nvcc_flags += " --opencc-options -OPT:Olimit=0"
+    nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
+    nvcc_flags += " -I \"%s\" -I \"%s\"" % (util_dir, svm_dir)
+
+    # dependencies
+    dependencies = ['kernel.cu'] + kernel.Glob('*.h') + kernel.Glob('../util/*.h') + kernel.Glob('svm/*.h')
+
+    # add command for each cuda architecture
+    for arch in cuda_archs:
+        cubin_file = os.path.join(build_dir, "kernel_%s.cubin" % arch)
+
+        command = "\"%s\" -arch=%s %s \"%s\" -o \"%s\"" % (nvcc, arch, nvcc_flags, kernel_file, cubin_file)
+
+        kernel.Command(cubin_file, 'kernel.cu', command)
+        kernel.Depends(cubin_file, dependencies)
+
+        kernel_binaries.append(cubin_file)
+
+Return('kernel_binaries')
+