Blender Git Loki

Git Commits -> Revision 77b7e1f

Revision 77b7e1f by Sergey Sharybin (master)
August 5, 2014, 07:57 (GMT)
Deduplicate CUDA and OpenCL wranglers

For now it was mainly about OpenCL wrangler being duplicated
between Cycles and Compositor, but with OpenSubdiv work those
wranglers were gonna to be duplicated just once again.

This commit makes it so Cycles and Compositor uses wranglers
from this repositories:

- https://github.com/CudaWrangler/cuew
- https://github.com/OpenCLWrangler/clew

This repositories are based on the wranglers we used before
and they'll be likely continued maintaining by us plus some
more players in the market.

Pretty much straightforward change with some tricks in the
CMake/SCons to make this libs being passed to the linker
after all other libraries in order to make OpenSubdiv linked
against those wranglers in the future.

For those who're worrying about Cycles being less standalone,
it's not truth, it's rather more flexible now and in the future
different wranglers might be used in Cycles. For now it'll
just mean those libs would need to be put into Cycles repository
together with some other libs from Blender such as mikkspace.

This is mainly platform maintenance commit, should not be any
changes to the user space.

Reviewers: juicyfruit, dingto, campbellbarton

Reviewed By: juicyfruit, dingto, campbellbarton

Differential Revision: https://developer.blender.org/D707

Commit Details:

Full Hash: 77b7e1fe9abb882b7bd1d60f5273e03f079d8a54
Parent Commit: a3fac84
Lines Changed: +6210, -4679

15 Added Paths:

/extern/clew/CMakeLists.txt (+42, -0) (View)
/extern/clew/include/clew.h (+2759, -0) (View)
/extern/clew/SConscript (+35, -0) (View)
/extern/clew/src/clew.c (+382, -0) (View)
/extern/cuew/auto/cuda_errors.py (+35, -0) (View)
/extern/cuew/auto/cuda_extra.py (+125, -0) (View)
/extern/cuew/auto/cuew_gen.py (+591, -0) (View)
/extern/cuew/auto/cuew_gen.sh (+10, -0) (View)
/extern/cuew/auto/stdlib.h (+3, -0) (View)
/extern/cuew/CMakeLists.txt (+40, -0) (View)
/extern/cuew/include/cuew.h (+1138, -0) (View)
/extern/cuew/LICENSE (+174, -0)
/extern/cuew/README (+12, -0)
/extern/cuew/SConscript (+35, -0) (View)
/extern/cuew/src/cuew.c (+710, -0) (View)

10 Deleted Paths:

/intern/cycles/util/util_cuda.cpp (+0, -503)
/intern/cycles/util/util_cuda.h (+0, -636)
/intern/cycles/util/util_opencl.cpp (+0, -337)
/intern/cycles/util/util_opencl.h (+0, -1313)
/intern/opencl/CMakeLists.txt (+0, -42)
/intern/opencl/intern/clew.c (+0, -316)
/intern/opencl/intern/clew.h (+0, -1317)
/intern/opencl/intern/OCL_opencl.c (+0, -37)
/intern/opencl/OCL_opencl.h (+0, -37)
/intern/opencl/SConscript (+0, -34)

23 Modified Paths:

/build_files/cmake/macros.cmake (+6, -0) (Diff)
/extern/CMakeLists.txt (+5, -0) (Diff)
/extern/SConscript (+4, -0) (Diff)
/intern/CMakeLists.txt (+0, -4) (Diff)
/intern/cycles/app/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/device/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/device/device.cpp (+9, -8) (Diff)
/intern/cycles/device/device_cuda.cpp (+35, -68) (Diff)
/intern/cycles/device/device_intern.h (+2, -0) (Diff)
/intern/cycles/device/device_opencl.cpp (+23, -2) (Diff)
/intern/cycles/SConscript (+1, -1) (Diff)
/intern/cycles/util/CMakeLists.txt (+0, -4) (Diff)
/intern/SConscript (+0, -3) (Diff)
/SConstruct (+7, -2) (Diff)
/source/blender/compositor/CMakeLists.txt (+3, -1) (Diff)
/source/blender/compositor/intern/COM_compositor.cpp (+1, -1) (Diff)
/source/blender/compositor/intern/COM_NodeOperation.h (+1, -1) (Diff)
/source/blender/compositor/intern/COM_OpenCLDevice.cpp (+4, -4) (Diff)
/source/blender/compositor/intern/COM_OpenCLDevice.h (+1, -1) (Diff)
/source/blender/compositor/intern/COM_WorkScheduler.cpp (+3, -3) (Diff)
/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp (+2, -2) (Diff)
/source/blender/compositor/SConscript (+2, -2) (Diff)
/source/blenderplayer/CMakeLists.txt (+6, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021