Commit: afd29854d3044e1aabe557a32ac4b8408e235217
Author: Xavier Hallade
Date: Wed Jun 8 22:09:25 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBafd29854d3044e1aabe557a32ac4b8408e235217
Cycles oneAPI: cleanup kernel_tex_image_interp_3d
===================================================================
M intern/cycles/kernel/device/oneapi/image.h
===================================================================
diff --git a/intern/cycles/kernel/device/oneapi/image.h
b/intern/cycles/kernel/device/oneapi/image.h
index c556efa80e2..f4debcd806a 100644
--- a/intern/cycles/kernel/device/oneapi/image.h
+++ b/intern/cycles/kernel/device/oneapi/image.h
@@ -300,14 +300,16 @@ ccl_device float4
kernel_tex_image_interp_3d(KernelGlobals, int id, float3 P, in
return NanoVDBInterpolator<nanovdb::Vec3f>::interp_3d(info, x, y, z,
interpolation);
}
else if (info.data_type == IMAGE_DATA_TYPE_NANOVDB_FPN) {
- return NanoVDBInterpolator<nanovdb::FpN>::interp_3d(info, P.x, P.y, P.z,
interpolation);
+ return NanoVDBInterpolator<nanovdb::FpN>::interp_3d(info, x, y, z,
interpolation);
}
else if (info.data_type == IMAGE_DATA_TYPE_NANOVDB_FP16) {
- return NanoVDBInterpolator<nanovdb::Fp16>::interp_3d(info, P.x, P.y, P.z,
interpolation);
+ return NanoVDBInterpolator<nanovdb::Fp16>::interp_3d(info, x, y, z,
interpolation);
}
#else
if (info.data_type == IMAGE_DATA_TYPE_NANOVDB_FLOAT ||
- info.data_type == IMAGE_DATA_TYPE_NANOVDB_FLOAT3) {
+ info.data_type == IMAGE_DATA_TYPE_NANOVDB_FLOAT3 ||
+ info.data_type == IMAGE_DATA_TYPE_NANOVDB_FPN ||
+ info.data_type == IMAGE_DATA_TYPE_NANOVDB_FP16) {
return make_float4(
TEX_IMAGE_MISSING_R, TEX_IMAGE_MISSING_G, TEX_IMAGE_MISSING_B,
TEX_IMAGE_MISSING_A);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
