1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cycles: Embree: Resolve padding-related issue during buffer creations

Browse Source
This commit is contained in:
Nikita Sirgienko 2023-07-04 10:46:07 +02:00
parent e73bb628ee
commit 7c4108567b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/bvh/embree.cpp
View File

@ -343,6 +343,11 @@ void BVHEmbree::set_tri_vertex_buffer(RTCGeometry geom_id, const Mesh *mesh, con
} }
else { else {
if (!rtc_device_is_sycl) { if (!rtc_device_is_sycl) {
/* NOTE(sirgienko) Embree requires padding for VERTEX layout as last buffer element
* must be readable using 16-byte SSE load instructions. Because of this, we are
* artificially increasing shared buffer size by 1 - it shouldn't cause any memory
* access violation as this last element is not accessed directly since no triangle
* can reference it. */
rtcSetSharedGeometryBuffer(geom_id, rtcSetSharedGeometryBuffer(geom_id,
RTC_BUFFER_TYPE_VERTEX, RTC_BUFFER_TYPE_VERTEX,
t, t,
@ -358,13 +363,15 @@ void BVHEmbree::set_tri_vertex_buffer(RTCGeometry geom_id, const Mesh *mesh, con
* of making a shared geometry buffer - a new Embree buffer will be created and data * of making a shared geometry buffer - a new Embree buffer will be created and data
* will be copied. */ * will be copied. */
/* As float3 is packed on GPU side, we map it to packed_float3. */ /* As float3 is packed on GPU side, we map it to packed_float3. */
/* There is no need for additional padding in rtcSetNewGeometryBuffer since Embree 3.6:
* "Fixed automatic vertex buffer padding when using rtcSetNewGeometry API function". */
packed_float3 *verts_buffer = (packed_float3 *)rtcSetNewGeometryBuffer( packed_float3 *verts_buffer = (packed_float3 *)rtcSetNewGeometryBuffer(
geom_id, geom_id,
RTC_BUFFER_TYPE_VERTEX, RTC_BUFFER_TYPE_VERTEX,
t, t,
RTC_FORMAT_FLOAT3, RTC_FORMAT_FLOAT3,
sizeof(packed_float3), sizeof(packed_float3),
num_verts + 1); num_verts);
assert(verts_buffer); assert(verts_buffer);
if (verts_buffer) { if (verts_buffer) {
for (size_t i = (size_t)0; i < num_verts; ++i) { for (size_t i = (size_t)0; i < num_verts; ++i) {