diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-20 17:08:06 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-20 23:29:26 +0300 |
commit | 3d364896725db8336d785ba6cf977b62c0f2c0ce (patch) | |
tree | b189cdc4956b557d19b0c2ea976c6f48affa1ed2 /build_files/scons/config | |
parent | 2466c4f8cebd3977f29524d79050feff44b40fff (diff) |
OpenSubdiv: Commit of OpenSubdiv integration into Blender
This commit contains all the remained parts needed for initial integration of
OpenSubdiv into Blender's subdivision surface code. Includes both GPU and CPU
backends which works in the following way:
- When SubSurf modifier is the last in the modifiers stack then GPU pipeline
of OpenSubdiv is used, making viewport performance as fast as possible.
This also requires graphscard with GLSL 1.5 support. If this requirement is
not met, then no GPU pipeline is used at all.
- If SubSurf is not a last modifier or if DerivesMesh is being evaluated for
rendering then CPU limit evaluation API from OpenSubdiv is used. This only
replaces the legacy evaluation code from CCGSubSurf_legacy, but keeps CCG
structures exactly the same as they used to be for ages now.
This integration is fully covered with ifdef and not enabled by default
because there are several TODOs to be solved first:
- Face varying data interpolation is not really cleanly implemented for GPU
in OpenSubdiv 3.0. It is also not implemented for limit evaluation API.
This basically means we'll have really hard time supporting UVs.
- Limit evaluation only works with adaptivly subdivided meshes so far, which
basically means all the points of CCG are pushed to the limit. This gives
different result from old code.
- There are some serious optimizations possible on the topology refiner
creation, which would speed up initial OpenSubdiv mesh creation.
- There are some hardcoded asumptions in the GPU and DerivedMesh areas which
could be generalized.
That's something where Antony and Campbell can help, making it so the code
is structured in a way which is reusable by all planned viewport projects.
- There are also some workarounds in the dependency graph to make sure OpenGL
buffers are only freed from the main thread.
Those who'll be wanting to make experiments with this code should grab dev
branch (NOT master) from
https://github.com/Nazg-Gul/OpenSubdiv/tree/dev
There are some patches applied in there which we're working on on getting
into upstream.
Diffstat (limited to 'build_files/scons/config')
-rw-r--r-- | build_files/scons/config/darwin-config.py | 6 | ||||
-rw-r--r-- | build_files/scons/config/linux-config.py | 8 | ||||
-rw-r--r-- | build_files/scons/config/win32-mingw-config.py | 6 | ||||
-rw-r--r-- | build_files/scons/config/win32-vc-config.py | 6 | ||||
-rw-r--r-- | build_files/scons/config/win64-mingw-config.py | 6 | ||||
-rw-r--r-- | build_files/scons/config/win64-vc-config.py | 6 |
6 files changed, 38 insertions, 0 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 1fb6d649ae9..d3d4afaa6ab 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -213,6 +213,12 @@ WITH_BF_FREESTYLE = True #OpenMP ( will be checked for compiler support and turned off eventually ) WITH_BF_OPENMP = True +WITH_BF_OPENSUBDIV = False +BF_OPENSUBDIV = LIBDIR + '/opensubdiv' +BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' +BF_OPENSUBDIV_LIB = 'osdCPU osdGPU' +BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib' + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = [] diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 9607045662f..3556c52021a 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -226,6 +226,14 @@ BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a' #Freestyle WITH_BF_FREESTYLE = True +WITH_BF_OPENSUBDIV = False +WITH_BF_STATICOPENSUBDIV = False +BF_OPENSUBDIV = '/usr' +BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' +BF_OPENSUBDIV_LIB = 'osdCPU osdGPU' +BF_OPENSUBDIV_LIB_STATIC = '${BF_OPENSUBDIV_LIBPATH}/libosdGPU.a ${BF_OPENSUBDIV_LIBPATH}/libosdCPU.a' +BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib' + ## CC = 'gcc' CXX = 'g++' diff --git a/build_files/scons/config/win32-mingw-config.py b/build_files/scons/config/win32-mingw-config.py index cbb7755637a..3a4dfcef4c9 100644 --- a/build_files/scons/config/win32-mingw-config.py +++ b/build_files/scons/config/win32-mingw-config.py @@ -166,6 +166,12 @@ BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_49 boost_filesystem-mgw46-mt-s-1_49 BF_BOOST_LIB_INTERNATIONAL = 'boost_locale-mgw46-mt-s-1_49' BF_BOOST_LIBPATH = '${BF_BOOST}/lib' +WITH_BF_OPENSUBDIV = False +BF_OPENSUBDIV = LIBDIR + '/opensubdiv' +BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' +BF_OPENSUBDIV_LIB = 'osdCPU osdGPU' +BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib' + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse'] diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 9f3b3440628..b639621c7d7 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -208,6 +208,12 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE'] #Freestyle WITH_BF_FREESTYLE = True +WITH_BF_OPENSUBDIV = False +BF_OPENSUBDIV = LIBDIR + '/opensubdiv' +BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' +BF_OPENSUBDIV_LIB = 'osdCPU osdGPU' +BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib' + WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' diff --git a/build_files/scons/config/win64-mingw-config.py b/build_files/scons/config/win64-mingw-config.py index e4def7e5a5c..16d859194db 100644 --- a/build_files/scons/config/win64-mingw-config.py +++ b/build_files/scons/config/win64-mingw-config.py @@ -165,6 +165,12 @@ BF_BOOST_LIB = 'boost_date_time-mgw47-mt-s-1_49 boost_date_time-mgw47-mt-sd-1_49 BF_BOOST_LIB_INTERNATIONAL = ' boost_locale-mgw47-mt-s-1_49 boost_locale-mgw47-mt-sd-1_49' BF_BOOST_LIBPATH = '${BF_BOOST}/lib' +WITH_BF_OPENSUBDIV = False +BF_OPENSUBDIV = LIBDIR + '/opensubdiv' +BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' +BF_OPENSUBDIV_LIB = 'osdCPU osdGPU' +BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib' + #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2'] diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 9ac0173537e..7cb6e6a471d 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -212,6 +212,12 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = [''] #Freestyle WITH_BF_FREESTYLE = True +WITH_BF_OPENSUBDIV = False +BF_OPENSUBDIV = LIBDIR + '/opensubdiv' +BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include' +BF_OPENSUBDIV_LIB = 'osdCPU osdGPU' +BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib' + WITH_BF_STATICOPENGL = False BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' |