[Bf-blender-cvs] [7689f501e2c] blender-v3.0-release: Cycles: enable HIP device and binaries on Windows

[Brecht Van Lommel]

Commit: 7689f501e2c3beb3535e4a390971d7b0fde74ee9
Author: Brecht Van Lommel
Date:   Tue Nov 9 16:00:06 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB7689f501e2c3beb3535e4a390971d7b0fde74ee9

Cycles: enable HIP device and binaries on Windows

We've now done testing to confirm this works with RDNA and RDNA2 AMD GPUs
on Windows. The AMD driver needed for this will soon be released publicly.

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

M	CMakeLists.txt
M	build_files/cmake/config/blender_release.cmake

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a5ac1918bc..d2e2d02dcde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -440,7 +440,11 @@ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
 mark_as_advanced(WITH_CUDA_DYNLOAD)
 
 # AMD HIP
-option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" OFF)
+if(WIN32)
+  option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
+else()
+  option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" OFF)
+endif()
 option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
 set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
 mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index b8180d733de..04074db688d 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -81,4 +81,5 @@ if(NOT APPLE)
   set(WITH_CYCLES_DEVICE_OPTIX    ON  CACHE BOOL "" FORCE)
   set(WITH_CYCLES_CUDA_BINARIES   ON  CACHE BOOL "" FORCE)
   set(WITH_CYCLES_CUBIN_COMPILER  OFF CACHE BOOL "" FORCE)
+  set(WITH_CYCLES_HIP_BINARIES    ON  CACHE BOOL "" FORCE)
 endif()