aboutsummaryrefslogtreecommitdiff
path: root/APEX_1.4/common/src/ApexSharedUtils.cpp
diff options
context:
space:
mode:
authorSheikh Dawood <[email protected]>2018-04-09 10:13:48 -0500
committerSheikh Dawood <[email protected]>2018-04-09 10:13:48 -0500
commit238605d8225a9135d6b60646e05d066e25424eee (patch)
tree2b013bd4946bb3c699d7a06ef1f21be85d367f63 /APEX_1.4/common/src/ApexSharedUtils.cpp
parentAdd ParamTool.exe (diff)
downloadphysx-3.4-238605d8225a9135d6b60646e05d066e25424eee.tar.xz
physx-3.4-238605d8225a9135d6b60646e05d066e25424eee.zip
PhysX 3.4, APEX 1.4 patch release @23879214
Diffstat (limited to 'APEX_1.4/common/src/ApexSharedUtils.cpp')
-rw-r--r--APEX_1.4/common/src/ApexSharedUtils.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/APEX_1.4/common/src/ApexSharedUtils.cpp b/APEX_1.4/common/src/ApexSharedUtils.cpp
index 9b2b1b83..f9854b81 100644
--- a/APEX_1.4/common/src/ApexSharedUtils.cpp
+++ b/APEX_1.4/common/src/ApexSharedUtils.cpp
@@ -2452,10 +2452,10 @@ static void _arrayVec3ToVec4(const PxVec3* src, physx::aos::Vec4V* dst, PxU32 nu
const PxU32 num4 = num >> 2;
for (PxU32 i = 0; i < num4; i++, dst += 3, src += 4)
{
- Vec3V v0 = V3LoadU(&src[0].x);
- Vec3V v1 = V3LoadU(&src[1].x);
- Vec3V v2 = V3LoadU(&src[2].x);
- Vec3V v3 = V3LoadU(&src[3].x);
+ Vec4V v0 = Vec4V_From_Vec3V(V3LoadU(&src[0].x));
+ Vec4V v1 = Vec4V_From_Vec3V(V3LoadU(&src[1].x));
+ Vec4V v2 = Vec4V_From_Vec3V(V3LoadU(&src[2].x));
+ Vec4V v3 = Vec4V_From_Vec3V(V3LoadU(&src[3].x));
// Transpose
V4Transpose(v0, v1, v2, v3);
// Save
@@ -2466,9 +2466,9 @@ static void _arrayVec3ToVec4(const PxVec3* src, physx::aos::Vec4V* dst, PxU32 nu
const PxU32 remain = num & 3;
if (remain)
{
- Vec3V work[4];
+ Vec4V work[4];
PxU32 i = 0;
- for (; i < remain; i++) work[i] = V3LoadU(&src[i].x);
+ for (; i < remain; i++) work[i] = Vec4V_From_Vec3V(V3LoadU(&src[i].x));
for (; i < 4; i++) work[i] = work[remain - 1];
V4Transpose(work[0], work[1], work[2], work[3]);
dst[0] = work[0];
@@ -2490,10 +2490,10 @@ static void _arrayVec3ToVec4(const PxVec3* src, const physx::aos::Vec3V& scale,
const PxU32 num4 = num >> 2;
for (PxU32 i = 0; i < num4; i++, dst += 3, src += 4)
{
- Vec3V v0 = V3Mul(scale, V3LoadU(&src[0].x));
- Vec3V v1 = V3Mul(scale, V3LoadU(&src[1].x));
- Vec3V v2 = V3Mul(scale, V3LoadU(&src[2].x));
- Vec3V v3 = V3Mul(scale, V3LoadU(&src[3].x));
+ Vec4V v0 = Vec4V_From_Vec3V(V3Mul(scale, V3LoadU(&src[0].x)));
+ Vec4V v1 = Vec4V_From_Vec3V(V3Mul(scale, V3LoadU(&src[1].x)));
+ Vec4V v2 = Vec4V_From_Vec3V(V3Mul(scale, V3LoadU(&src[2].x)));
+ Vec4V v3 = Vec4V_From_Vec3V(V3Mul(scale, V3LoadU(&src[3].x)));
// Transpose
V4Transpose(v0, v1, v2, v3);
// Save
@@ -2504,9 +2504,9 @@ static void _arrayVec3ToVec4(const PxVec3* src, const physx::aos::Vec3V& scale,
const PxU32 remain = num & 3;
if (remain)
{
- Vec3V work[4];
+ Vec4V work[4];
PxU32 i = 0;
- for (; i < remain; i++) work[i] = V3Mul(scale, V3LoadU(&src[i].x));
+ for (; i < remain; i++) work[i] = Vec4V_From_Vec3V(V3Mul(scale, V3LoadU(&src[i].x)));
for (; i < 4; i++) work[i] = work[remain - 1];
V4Transpose(work[0], work[1], work[2], work[3]);
dst[0] = work[0];