diff options
| author | Sebastian Parborg <darkdefende@gmail.com> | 2022-08-15 17:44:24 +0300 |
|---|---|---|
| committer | Sebastian Parborg <darkdefende@gmail.com> | 2022-08-15 17:47:20 +0300 |
| commit | 8ffc11dbcb21e81634e8f22cd65fdc921c7320d1 (patch) | |
| tree | 9392fe6f5951f6ffd0d7d5fbeea34e5f728d8b4b /intern/cycles/device | |
| parent | a296b8f694d1a93d40da78312758580f69b43be7 (diff) | |
Cleanup OpenGL linking and related code after libepoxy merge
This cleans up the OpenGL build flags and linking.
It additionally also removes some dead code.
One of these dead code paths is WITH_X11_ALPHA which actually never was
active even with the build flag on. The call to use this was never
called because the default initializer for GHOST was set to have it off
per default. Nothing called this function with a boolean value to enable it.
These cleanups are needed to support true headless OpenGL rendering.
Without these cleanups libepoxy will fail to load the correct OpenGL
Libraries as we have already linked them to the blender binary.
Reviewed By: Brecht, Campbell, Jeroen
Differential Revision: http://developer.blender.org/D15554
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 71789a76406..4ae123cd634 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -147,7 +147,6 @@ set(SRC set(LIB cycles_kernel cycles_util - ${CYCLES_GL_LIBRARIES} ) if(WITH_CYCLES_DEVICE_OPTIX OR WITH_CYCLES_DEVICE_CUDA) @@ -168,8 +167,6 @@ if(WITH_CYCLES_DEVICE_HIP AND WITH_HIP_DYNLOAD) ) endif() -add_definitions(${GL_DEFINITIONS}) - if(WITH_CYCLES_DEVICE_CUDA) add_definitions(-DWITH_CUDA) endif() |