Blender Git Loki
Git Commits -> Revision 3d36489
Revision 3d36489 by Sergey Sharybin (master) July 20, 2015, 20:29 (GMT) |
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. |
Commit Details:
Full Hash: 3d364896725db8336d785ba6cf977b62c0f2c0ce
Parent Commit: 2466c4f
Lines Changed: +1556, -190
53 Modified Paths:
/build_files/cmake/macros.cmake (+14, -0) (Diff)
/build_files/scons/config/darwin-config.py (+6, -0) (Diff)
/build_files/scons/config/linux-config.py (+8, -0) (Diff)
/build_files/scons/config/win32-mingw-config.py (+6, -0) (Diff)
/build_files/scons/config/win32-vc-config.py (+6, -0) (Diff)
/build_files/scons/config/win64-mingw-config.py (+6, -0) (Diff)
/build_files/scons/config/win64-vc-config.py (+6, -0) (Diff)
/build_files/scons/tools/Blender.py (+12, -0) (Diff)
/build_files/scons/tools/btools.py (+10, -1) (Diff)
/CMakeLists.txt (+32, -0) (Diff)
/extern/CMakeLists.txt (+1, -1) (Diff)
/extern/SConscript (+1, -1) (Diff)
/intern/CMakeLists.txt (+4, -1) (Diff)
/intern/opensubdiv/opensubdiv_converter.cc (+5, -0) (Diff)
/intern/opensubdiv/opensubdiv_gpu_capi.cc (+2, -7) (Diff)
/intern/SConscript (+2, -0) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+4, -0) (Diff)
/SConstruct (+3, -0) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+6, -0) (Diff)
/source/blender/blenkernel/BKE_subsurf.h (+3, -2) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+10, -0) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf.c (+94, -4) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf.h (+46, -0) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf_intern.h (+57, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+54, -12) (Diff)
/source/blender/blenkernel/intern/scene.c (+45, -0) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+496, -113) (Diff)
/source/blender/blenkernel/SConscript (+5, -0) (Diff)
/source/blender/gpu/CMakeLists.txt (+4, -0) (Diff)
/source/blender/gpu/GPU_draw.h (+5, -0) (Diff)
/source/blender/gpu/GPU_material.h (+8, -2) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+169, -9) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+66, -7) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+90, -10) (Diff)
/source/blender/gpu/intern/gpu_material.c (+78, -11) (Diff)
/source/blender/gpu/intern/gpu_simple_shader.c (+2, -1) (Diff)
/source/blender/gpu/SConscript (+4, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+5, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_vertex.glsl (+19, -2) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+13, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+75, -0) (Diff)
/source/blender/makesrna/intern/SConscript (+4, -0) (Diff)
/source/blender/makesrna/SConscript (+4, -0) (Diff)
/source/blender/modifiers/CMakeLists.txt (+4, -0) (Diff)
/source/blender/modifiers/intern/MOD_subsurf.c (+28, -3) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+7, -0) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+8, -0) (Diff)
/source/blender/windowmanager/SConscript (+4, -0) (Diff)
/source/blenderplayer/CMakeLists.txt (+4, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+1, -1) (Diff)
/build_files/scons/config/darwin-config.py (+6, -0) (Diff)
/build_files/scons/config/linux-config.py (+8, -0) (Diff)
/build_files/scons/config/win32-mingw-config.py (+6, -0) (Diff)
/build_files/scons/config/win32-vc-config.py (+6, -0) (Diff)
/build_files/scons/config/win64-mingw-config.py (+6, -0) (Diff)
/build_files/scons/config/win64-vc-config.py (+6, -0) (Diff)
/build_files/scons/tools/Blender.py (+12, -0) (Diff)
/build_files/scons/tools/btools.py (+10, -1) (Diff)
/CMakeLists.txt (+32, -0) (Diff)
/extern/CMakeLists.txt (+1, -1) (Diff)
/extern/SConscript (+1, -1) (Diff)
/intern/CMakeLists.txt (+4, -1) (Diff)
/intern/opensubdiv/opensubdiv_converter.cc (+5, -0) (Diff)
/intern/opensubdiv/opensubdiv_gpu_capi.cc (+2, -7) (Diff)
/intern/SConscript (+2, -0) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+4, -0) (Diff)
/SConstruct (+3, -0) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+6, -0) (Diff)
/source/blender/blenkernel/BKE_subsurf.h (+3, -2) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+10, -0) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf.c (+94, -4) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf.h (+46, -0) (Diff)
/source/blender/blenkernel/intern/CCGSubSurf_intern.h (+57, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+54, -12) (Diff)
/source/blender/blenkernel/intern/scene.c (+45, -0) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+496, -113) (Diff)
/source/blender/blenkernel/SConscript (+5, -0) (Diff)
/source/blender/gpu/CMakeLists.txt (+4, -0) (Diff)
/source/blender/gpu/GPU_draw.h (+5, -0) (Diff)
/source/blender/gpu/GPU_material.h (+8, -2) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+169, -9) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+66, -7) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+90, -10) (Diff)
/source/blender/gpu/intern/gpu_material.c (+78, -11) (Diff)
/source/blender/gpu/intern/gpu_simple_shader.c (+2, -1) (Diff)
/source/blender/gpu/SConscript (+4, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+5, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_vertex.glsl (+19, -2) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+13, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+7, -0) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+75, -0) (Diff)
/source/blender/makesrna/intern/SConscript (+4, -0) (Diff)
/source/blender/makesrna/SConscript (+4, -0) (Diff)
/source/blender/modifiers/CMakeLists.txt (+4, -0) (Diff)
/source/blender/modifiers/intern/MOD_subsurf.c (+28, -3) (Diff)
/source/blender/windowmanager/CMakeLists.txt (+7, -0) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+8, -0) (Diff)
/source/blender/windowmanager/SConscript (+4, -0) (Diff)
/source/blenderplayer/CMakeLists.txt (+4, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021