Merge branch 'blender-v5.0-release'

This commit is contained in:
Nikita Sirgienko
2025-10-08 13:37:05 +02:00
4 changed files with 6 additions and 6 deletions

View File

@@ -744,7 +744,7 @@ This option is only for debugging purposes."
# `ocloc compile --help`.
# If you have completed optimization work and now want to enable AoT for new Intel devices,
# update the optimization status in OneapiDevice::architecture_information.
set(CYCLES_ONEAPI_INTEL_BINARIES_ARCH dg2 mtl lnl bmg CACHE STRING "\
set(CYCLES_ONEAPI_INTEL_BINARIES_ARCH dg2 mtl lnl bmg ptl CACHE STRING "\
oneAPI Intel GPU architectures to build binaries for"
)
set(CYCLES_ONEAPI_SYCL_TARGETS spir64 spir64_gen CACHE STRING "\

View File

@@ -20,7 +20,7 @@ buildbot:
optix:
version: '8.0.0'
ocloc:
version: '101.6557'
version: '101.8132'
cmake:
default:
version: any

View File

@@ -1844,7 +1844,7 @@ class CyclesPreferences(bpy.types.AddonPreferences):
elif device_type == 'ONEAPI':
import sys
if sys.platform.startswith("win"):
driver_version = "XX.X.101.6557"
driver_version = "XX.X.101.8132"
col.label(text=rpt_("Requires Intel GPU with Xe-HPG architecture"), icon='BLANK1', translate=False)
col.label(text=rpt_("and Windows driver version %s or newer") % driver_version,
icon='BLANK1', translate=False)

View File

@@ -1385,11 +1385,11 @@ void OneapiDevice::get_adjusted_global_and_local_sizes(SyclQueue *queue,
/* Compute-runtime (ie. NEO) version is what gets returned by sycl/L0 on Windows
* since Windows driver 101.3268. */
static const int lowest_supported_driver_version_win = 1016554;
static const int lowest_supported_driver_version_win = 1018132;
# ifdef _WIN32
/* For Windows driver 101.6557, compute-runtime version is 31896.
/* For Windows driver 101.8132, compute-runtime version is 34938.
* This information is returned by `ocloc query OCL_DRIVER_VERSION`. */
static const int lowest_supported_driver_version_neo = 31896;
static const int lowest_supported_driver_version_neo = 34938;
# else
static const int lowest_supported_driver_version_neo = 34666;
# endif