griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #137966: oneAPI crash when max texture size is exceeded

Browse Source 
Until the texture cache addresses this properly, show a useful error rather
than crashing.

Pull Request: https://projects.blender.org/blender/blender/pulls/139892
This commit is contained in:
Brecht Van Lommel
2025-06-05 20:37:25 +02:00
committed by Brecht Van Lommel
parent 5905a1309a
commit a4cfd14f0a
1 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
intern/cycles/device/oneapi/device_impl.cpp
View File

@@ -764,6 +764,41 @@ void OneapiDevice::tex_alloc(device_texture &mem)
sycl::ext::oneapi::experimental::image_descriptor desc{};
if (mem.data_height > 0) {
const sycl::device &device = reinterpret_cast<sycl::queue *>(queue)->get_device();
if (mem.data_depth > 1) {
const size_t max_width = device.get_info<sycl::info::device::image3d_max_width>();
const size_t max_height = device.get_info<sycl::info::device::image3d_max_height>();
const size_t max_depth = device.get_info<sycl::info::device::image3d_max_depth>();
if (mem.data_width > max_width || mem.data_height > max_height ||
mem.data_depth > max_depth)
{
set_error(string_printf(
"Maximum GPU 3D texture size exceeded (max %zux%zux%zu, found %zux%zux%zu)",
max_width,
max_height,
max_depth,
mem.data_width,
mem.data_height,
mem.data_depth));
return;
}
}
else {
const size_t max_width = device.get_info<sycl::info::device::image2d_max_width>();
const size_t max_height = device.get_info<sycl::info::device::image2d_max_height>();
if (mem.data_width > max_width || mem.data_height > max_height) {
set_error(
string_printf("Maximum GPU 2D texture size exceeded (max %zux%zu, found %zux%zu)",
max_width,
max_height,
mem.data_width,
mem.data_height));
return;
}
}
/* 2D/3D texture -- Tile optimized */
size_t depth = mem.data_depth == 1 ? 0 : mem.data_depth;
desc = sycl::ext::oneapi::experimental::image_descriptor(
@@ -775,6 +810,10 @@ void OneapiDevice::tex_alloc(device_texture &mem)
sycl::ext::oneapi::experimental::image_mem_handle memHandle =
sycl::ext::oneapi::experimental::alloc_image_mem(desc, *queue);
if (!memHandle.raw_handle) {
set_error("GPU texture allocation failed: Raw handle is null");
return;
}
/* Copy data from host to the texture properly based on the texture description */
queue->ext_oneapi_copy(mem.host_pointer, memHandle, desc);
@@ -848,8 +887,7 @@ void OneapiDevice::tex_alloc(device_texture &mem)
}
}
catch (sycl::exception const &e) {
set_error("oneAPI texture allocation error: got runtime exception \"" + string(e.what()) +
"\"");
set_error("GPU texture allocation failed: runtime exception \"" + string(e.what()) + "\"");
}
}