[Bf-blender-cvs] [7cb48199fd1] cycles_oneapi: Merge branch 'master' into cycles_oneapi

[Stefan Werner]

Commit: 7cb48199fd17f5b8c69289c8b078a85995780803
Author: Stefan Werner
Date:   Mon May 2 09:31:31 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB7cb48199fd17f5b8c69289c8b078a85995780803

Merge branch 'master' into cycles_oneapi

===================================================================



===================================================================

diff --cc intern/cycles/cmake/external_libs.cmake
index 0c0bdd220d1,f4186374d10..5b875565c97
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@@ -80,10 -85,12 +85,13 @@@ if(CYCLES_STANDALONE_REPOSITORY
      _set_default(OSL_ROOT_DIR "${_cycles_lib_dir}/osl")
      _set_default(PNG_ROOT "${_cycles_lib_dir}/png")
      _set_default(PUGIXML_ROOT_DIR "${_cycles_lib_dir}/pugixml")
+     _set_default(SDL2_ROOT_DIR "${_cycles_lib_dir}/sdl")
      _set_default(TBB_ROOT_DIR "${_cycles_lib_dir}/tbb")
      _set_default(TIFF_ROOT "${_cycles_lib_dir}/tiff")
+     _set_default(USD_ROOT_DIR "${_cycles_lib_dir}/usd")
+     _set_default(WEBP_ROOT_DIR "${_cycles_lib_dir}/webp")
      _set_default(ZLIB_ROOT "${_cycles_lib_dir}/zlib")
 +    _set_default(LEVEL_ZERO_ROOT_DIR "${_cycles_lib_dir}/level-zero")
  
      # Ignore system libraries
      set(CMAKE_IGNORE_PATH "${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES};${CMAKE_SYSTEM_INCLUDE_PATH};${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES};${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}")
@@@ -675,34 -647,3 +648,21 @@@ if(WITH_CYCLES_DEVICE_METAL
      message(STATUS "Found Metal: ${METAL_LIBRARY}")
    endif()
  endif()
 +
 +###########################################################################
 +# oneAPI
 +###########################################################################
 +if (WITH_CYCLES_DEVICE_ONEAPI)
 +  find_package(SYCL)
 +  find_package(LevelZero)
 +
 +  if (SYCL_FOUND AND LEVEL_ZERO_FOUND)
 +    message(STATUS "Found oneAPI: ${SYCL_LIBRARY}")
 +    message(STATUS "Found Level Zero: ${LEVEL_ZERO_LIBRARY}")
 +  else()
 +    message(STATUS "oneAPI or Level Zero not found, disabling oneAPI device from Cycles")
 +    set(WITH_CYCLES_DEVICE_ONEAPI OFF)
 +  endif()
 +endif()
 +
 +unset(_cycles_lib_dir)
- 
- ###########################################################################
- # macOS
- ###########################################################################
- 
- if(CYCLES_STANDALONE_REPOSITORY)
-   # On macOS, always use zlib from system.
-   if(APPLE)
-     set(ZLIB_ROOT /usr)
-     find_package(ZLIB REQUIRED)
-     find_package(PNG REQUIRED)
-   endif()
- endif()