Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Cleanup, inline AVX register construction from kernel global data

Browse Source 
Currently should be no functional changes, preparing for some upcoming refactor.
This commit is contained in:
Sergey Sharybin
2017-03-23 12:41:33 +01:00
parent 5c06ff8bb9
commit e8ff06186e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/kernel/geom/geom_triangle_intersect.h
View File

@@ -123,8 +123,9 @@ ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
#if defined(__KERNEL_AVX2__) && defined(__KERNEL_SSE__)
const avxf avxf_P(P.m128, P.m128);
const avxf tri_ab = kernel_tex_fetch_avxf(__prim_tri_verts, tri_vindex + 0);
const avxf tri_bc = kernel_tex_fetch_avxf(__prim_tri_verts, tri_vindex + 1);
const ssef *ssef_verts = (ssef*)&kg->__prim_tri_verts.data[tri_vindex];
const avxf tri_ab = _mm256_loadu_ps((float *)(ssef_verts));
const avxf tri_bc = _mm256_loadu_ps((float *)(ssef_verts + 1));
const avxf AB = tri_ab - avxf_P;
const avxf BC = tri_bc - avxf_P;

6
intern/cycles/kernel/kernel_compat_cpu.h
View File

@@ -87,9 +87,9 @@ template<typename T> struct texture {
ccl_always_inline avxf fetch_avxf(const int index)
{
kernel_assert(index >= 0 && (index+1) < width);
ssef *ssefData = (ssef*)data;
ssef *ssefNodeData = &ssefData[index];
return _mm256_loadu_ps((float *)ssefNodeData);
ssef *ssef_data = (ssef*)data;
ssef *ssef_node_data = &ssef_data[index];
return _mm256_loadu_ps((float *)ssef_node_data);
}
#endif