[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25266] trunk/blender: * WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd.
Nathan Letwory
jesterking at letwory.net
Thu Dec 10 01:51:13 CET 2009
Revision: 25266
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25266
Author: jesterking
Date: 2009-12-10 01:51:13 +0100 (Thu, 10 Dec 2009)
Log Message:
-----------
* WITH_BF_RAYOPTIMIZATION cleanup and flag separation by matd.
This adds BF_RAYOPTIMIZATION_SSE_FLAGS through which one can manage
what SSE flags are best for the platform built for.
Note that the ray optimizations coded by jaguarandi are SSE-intrinsics only.
Modified Paths:
--------------
trunk/blender/config/darwin-config.py
trunk/blender/config/linux2-config.py
trunk/blender/config/win32-mingw-config.py
trunk/blender/config/win32-vc-config.py
trunk/blender/config/win64-vc-config.py
trunk/blender/source/blender/render/SConscript
trunk/blender/tools/btools.py
Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py 2009-12-10 00:41:03 UTC (rev 25265)
+++ trunk/blender/config/darwin-config.py 2009-12-10 00:51:13 UTC (rev 25266)
@@ -270,6 +270,14 @@
#BF_EXPAT_LIB = 'expat'
#BF_EXPAT_LIBPATH = '/usr/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+if MACOSX_ARCHITECTURE == 'i386':
+ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+elif MACOSX_ARCHITECTURE == 'x86_64':
+ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
+
+
#############################################################################
################### various compile settings and flags ##################
#############################################################################
Modified: trunk/blender/config/linux2-config.py
===================================================================
--- trunk/blender/config/linux2-config.py 2009-12-10 00:41:03 UTC (rev 25265)
+++ trunk/blender/config/linux2-config.py 2009-12-10 00:51:13 UTC (rev 25266)
@@ -167,6 +167,10 @@
WITH_BF_OPENMP = True
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
+
##
CC = 'gcc'
CXX = 'g++'
Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py 2009-12-10 00:41:03 UTC (rev 25265)
+++ trunk/blender/config/win32-mingw-config.py 2009-12-10 00:51:13 UTC (rev 25266)
@@ -137,6 +137,10 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
+
##
CC = 'gcc'
CXX = 'g++'
Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py 2009-12-10 00:41:03 UTC (rev 25265)
+++ trunk/blender/config/win32-vc-config.py 2009-12-10 00:51:13 UTC (rev 25266)
@@ -148,6 +148,10 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
@@ -155,6 +159,7 @@
BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
'${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
'${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+
CC = 'cl.exe'
CXX = 'cl.exe'
Modified: trunk/blender/config/win64-vc-config.py
===================================================================
--- trunk/blender/config/win64-vc-config.py 2009-12-10 00:41:03 UTC (rev 25265)
+++ trunk/blender/config/win64-vc-config.py 2009-12-10 00:51:13 UTC (rev 25266)
@@ -161,6 +161,10 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+#Ray trace optimization
+WITH_BF_RAYOPTIMIZATION = False
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
+
WITH_BF_STATICOPENGL = False
BF_OPENGL_INC = '${BF_OPENGL}/include'
BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
Modified: trunk/blender/source/blender/render/SConscript
===================================================================
--- trunk/blender/source/blender/render/SConscript 2009-12-10 00:41:03 UTC (rev 25265)
+++ trunk/blender/source/blender/render/SConscript 2009-12-10 00:51:13 UTC (rev 25266)
@@ -4,18 +4,28 @@
cflags = env['CCFLAGS']
cxxflags = env['CXXFLAGS']
+defs = []
+
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
if env['WITH_BF_RAYOPTIMIZATION']:
- cflags = env['CCFLAGS'] + ['/arch:SSE']
+ cflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
+ cxxflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
if env['OURPLATFORM'] == 'win32-mingw':
if env['WITH_BF_RAYOPTIMIZATION']:
- cflags = env['CCFLAGS'] + ['-mfpmath=sse']
+ cflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
+ cxxflags = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
if env['OURPLATFORM'] == 'darwin':
if env['MACOSX_ARCHITECTURE'] in ('i386', 'x86_64') and env['WITH_BF_RAYOPTIMIZATION']:
- cflags = env['CFLAGS'] + ['-mfpmath=sse']
- cxxflags = env['CXXFLAGS'] + ['-mfpmath=sse']
+ cflags = env['CFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
+ cxxflags = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
+
+if env['OURPLATFORM'] == 'linux2':
+ if env['WITH_BF_RAYOPTIMIZATION']:
+ cflags = env['CCFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
+ cxxflags = env['CXXFLAGS'] + env['BF_RAYOPTIMIZATION_SSE_FLAGS']
+ incs += ' ../../../extern/binreloc/include'
sources = env.Glob('intern/source/*.c')
raysources = env.Glob('intern/raytrace/*.cpp')
@@ -24,8 +34,6 @@
incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
incs += ' ../include ../blenloader ../../../intern/smoke/extern'
-defs = []
-
if env['WITH_BF_QUICKTIME']:
defs.append('WITH_QUICKTIME')
incs += ' ../quicktime ' + env['BF_QUICKTIME_INC']
@@ -33,15 +41,6 @@
if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR')
-if env['OURPLATFORM'] == 'linux2':
-# SSE is NOT safe all the time on linux, plus that ignores users compile flags and therefore no no
-# cflags = ['-O2','-msse2','-mfpmath=sse', '-pthread']
-# cxxflags = ['-O2','-msse2','-mfpmath=sse', '-pthread']
- if env['WITH_BF_RAYOPTIMIZATION']:
- cflags = env['CCFLAGS'] + ['-O2','-msse2','-mfpmath=sse', '-pthread']
- cxxflags = env['CXXFLAGS'] + ['-O2','-msse2','-mfpmath=sse', '-pthread']
- incs += ' ../../../extern/binreloc/include'
-
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py 2009-12-10 00:41:03 UTC (rev 25265)
+++ trunk/blender/tools/btools.py 2009-12-10 00:51:13 UTC (rev 25266)
@@ -76,7 +76,8 @@
'WITH_BF_FHS',
'BF_VERSION',
'BF_GHOST_DEBUG',
- 'WITH_BF_RAYOPTIMIZATION'
+ 'WITH_BF_RAYOPTIMIZATION',
+ 'BF_RAYOPTIMIZATION_SSE_FLAGS'
]
# Have options here that scons expects to be lists
@@ -423,7 +424,9 @@
(BoolVariable('BF_UNIT_TEST', 'Build with unit test support.', False)),
(BoolVariable('BF_GHOST_DEBUG', 'Make GHOST print events and info to stdout. (very verbose)', False)),
- (BoolVariable('WITH_BF_RAYOPTIMIZATION', 'Enable raytracer SSE/SIMD optimization.', False))
+
+ (BoolVariable('WITH_BF_RAYOPTIMIZATION', 'Enable raytracer SSE/SIMD optimization.', False)),
+ ('BF_RAYOPTIMIZATION_SSE_FLAGS', 'SSE flags', '')
) # end of opts.AddOptions()
return localopts
More information about the Bf-blender-cvs
mailing list