bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Brecht Van Lommel 2024-03-05 19:55:07 +01:00
commit 44d418143e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/hipew/src/hipew.c vendored
View File

@ -233,7 +233,7 @@ static int hipewHipInit(void) {
/* Library paths. */
#ifdef _WIN32
/* Expected in C:/Windows/System32 or similar, no path needed. */
const char *hip_paths[] = {"amdhip64.dll", NULL};
const char *hip_paths[] = {"amdhip64.dll", "amdhip64_6.dll", NULL};
#elif defined(__APPLE__)
/* Default installation path. */

7
intern/cycles/device/hiprt/device_impl.cpp
View File

@ -803,6 +803,12 @@ hiprtScene HIPRTDevice::build_tlas(BVHHIPRT *bvh,
hiprtBuildOptions options,
bool refit)
{
size_t num_object = objects.size();
if (num_object == 0) {
return 0;
}
hiprtBuildOperation build_operation = refit ? hiprtBuildOperationUpdate :
hiprtBuildOperationBuild;
@ -816,7 +822,6 @@ hiprtScene HIPRTDevice::build_tlas(BVHHIPRT *bvh,
size_t num_instances = 0;
int blender_instance_id = 0;
size_t num_object = objects.size();
user_instance_id.alloc(num_object);
prim_visibility.alloc(num_object);
hiprt_blas_ptr.alloc(num_object);