Merge branch 'blender-v4.4-release'

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -67,7 +67,10 @@ endif()
 set(ODIN_PATCH_COMMAND
   ${PATCH_CMD} --verbose -p 1 -N -d
   ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise <
-  ${PATCH_DIR}/oidn.diff
+  ${PATCH_DIR}/oidn.diff &&
+  ${PATCH_CMD} --verbose -p 1 -N -d
+  ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise <
+  ${PATCH_DIR}/oidn_blackwell.diff
 )
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

build_files/build_environment/cmake/versions.cmake

@@ -9,7 +9,7 @@
 # needed but it can be a useful reference.
 
 set(RELEASE_GCC_VERSION 11.2.*)
-set(RELEASE_CUDA_VERSION 12.3.*)
+set(RELEASE_CUDA_VERSION 12.8.*)
 set(RELEASE_HIP_VERSION 5.7.*)
 
 # Libraries

build_files/build_environment/patches/oidn_blackwell.diff

@@ -0,0 +1,41 @@
+diff -Naur orig/devices/cuda/CMakeLists.txt external_openimagedenoise/devices/cuda/CMakeLists.txt
+--- orig/devices/cuda/CMakeLists.txt
++++ external_openimagedenoise/devices/cuda/CMakeLists.txt
+@@ -51,13 +52,15 @@
+ set(OIDN_NVCC_SM75_FLAGS "-gencode arch=compute_75,code=sm_75")
+ set(OIDN_NVCC_SM80_FLAGS "-gencode arch=compute_80,code=sm_80")
+ set(OIDN_NVCC_SM90_FLAGS "-gencode arch=compute_90,code=sm_90")
++set(OIDN_NVCC_SM100_FLAGS "-gencode arch=compute_100,code=sm_100")
++set(OIDN_NVCC_SM120_FLAGS "-gencode arch=compute_120,code=sm_120")
+ 
+ set_source_files_properties(
+   cuda_conv.cu
+   cuda_device.cu
+   cuda_engine.cu
+   PROPERTIES COMPILE_FLAGS
+-    "${OIDN_NVCC_SM70_FLAGS} ${OIDN_NVCC_SM75_FLAGS} ${OIDN_NVCC_SM80_FLAGS} ${OIDN_NVCC_SM90_FLAGS}"
++    "${OIDN_NVCC_SM70_FLAGS} ${OIDN_NVCC_SM75_FLAGS} ${OIDN_NVCC_SM80_FLAGS} ${OIDN_NVCC_SM90_FLAGS} ${OIDN_NVCC_SM100_FLAGS} ${OIDN_NVCC_SM120_FLAGS}"
+ )
+ 
+ set_source_files_properties(
+@@ -72,7 +75,7 @@
+ 
+ set_source_files_properties(
+   cutlass_conv_sm80.cu
+-  PROPERTIES COMPILE_FLAGS "${OIDN_NVCC_SM80_FLAGS} ${OIDN_NVCC_SM90_FLAGS}"
++  PROPERTIES COMPILE_FLAGS "${OIDN_NVCC_SM80_FLAGS} ${OIDN_NVCC_SM90_FLAGS} ${OIDN_NVCC_SM100_FLAGS} ${OIDN_NVCC_SM120_FLAGS}"
+ )
+ 
+ add_library(OpenImageDenoise_device_cuda SHARED ${OIDN_CUDA_SOURCES} ${OIDN_GPU_SOURCES} ${OIDN_RESOURCE_FILE})
+diff -Naur orig/devices/cuda/cuda_device.h external_openimagedenoise/devices/cuda/cuda_device.h
+--- orig/devices/cuda/cuda_device.h
++++ external_openimagedenoise/devices/cuda/cuda_device.h
+@@ -50,7 +50,7 @@
+ 
+     // Supported compute capabilities
+     static constexpr int minSMArch = 70;
+-    static constexpr int maxSMArch = 99;
++    static constexpr int maxSMArch = 120;
+ 
+     int deviceID = 0;
+   #if defined(OIDN_DEVICE_CUDA_API_DRIVER)

build_files/build_environment/windows/vmprep.cmd.txt

@@ -27,7 +27,7 @@ echo # - Meson 1.6.0
 echo # - Visual Studio 2010 X64 redist (required for the yaml binary) 
 echo # - Git 2.38.0
 echo # - CMake 3.24.2
-echo # - Cuda 12.3.2
+echo # - Cuda 12.8.0
 echo # - HIP 5.7.1
 echo #
 echo # Additionally this will also create and populate the following folders :
@@ -92,18 +92,18 @@ curl https://download.microsoft.com/download/3/2/2/3224B87F-CFA0-4E70-BDA3-3DE65
 echo Installing Visual studio 2010 x64 redist
 start /wait c:\install\vcredist_x64.exe /passive /norestart
 
-echo Obtaining cuda 12.3.2
-curl https://developer.download.nvidia.com/compute/cuda/12.3.2/local_installers/cuda_12.3.2_546.12_windows.exe  -o c:\install\cuda_12.3.2_546.12_windows.exe
-echo Installing  cuda 12.3.2
+echo Obtaining cuda 12.8.0
+curl https://developer.download.nvidia.com/compute/cuda/12.8.0/local_installers/cuda_12.8.0_571.96_windows.exe  -o c:\install\cuda_12.8.0_571.96_windows.exe
+echo Installing  cuda 12.8.0
 echo *********************************************************************
 echo ** CUDA is a bit of a pain to install due to it lacking features   **
 echo ** for unattended installs, the installer should have just started **
-echo ** manually install it to c:\tools\cuda\12.3.2\ this HAS to be the **
+echo ** manually install it to c:\tools\cuda\12.8.0\ this HAS to be the **
 echo ** place, don't use anything else, This folder has been created    **
 echo ** so you should be able to just browse to it in the installer     **
 echo *********************************************************************
-mkdir c:\tools\cuda\12.3.2\
-start /wait c:\install\cuda_12.3.2_546.12_windows.exe 
+mkdir c:\tools\cuda\12.8.0\
+start /wait c:\install\cuda_12.8.0_571.96_windows.exe
 
 echo Obtaining Hip SDK 5.7.1
 curl https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-23.Q4-WinSvr2022-For-HIP.exe  -o c:\install\AMD-Software-PRO-Edition-23.Q4-WinSvr2022-For-HIP.exe