Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

SSE2: More alignment fixes

Browse Source 
--HG--
branch : sse2
hg/feature/sse2
kaetemi 11 years ago
parent 7c7db53c72
commit 1ceaed828a
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
code/nel/include/nel/sound/clustered_sound.h
Unescape Escape View File

@ -50,6 +50,7 @@ class CClusteredSound
{ {
public: public:
/// This structure contain data about sound status in a cluster /// This structure contain data about sound status in a cluster
NL_ALIGN_SSE2(16)
struct CClusterSoundStatus struct CClusterSoundStatus
{ {
/// The relative gain of sound in the cluster /// The relative gain of sound in the cluster
@ -78,6 +79,7 @@ public:
typedef std::map<NL3D::CCluster*, CClusterSoundStatus> TClusterStatusMap; typedef std::map<NL3D::CCluster*, CClusterSoundStatus> TClusterStatusMap;
/// This structure is used when we traverse the cluster/portal graph. /// This structure is used when we traverse the cluster/portal graph.
NL_ALIGN_SSE2(16)
struct CSoundTravContext struct CSoundTravContext
{ {
/// The current gain. /// The current gain.

26
code/nel/src/3d/ps_mesh.cpp
Unescape Escape View File

@ -660,9 +660,9 @@ public:
CHECK_VERTEX_BUFFER(outVb, outVertex + outNormalOff); CHECK_VERTEX_BUFFER(outVb, outVertex + outNormalOff);
// translate and resize the vertex (relatively to the mesh origin) // translate and resize the vertex (relatively to the mesh origin)
*(CVectorPacked *) outVertex = *posIt + sM * *(CVector *) inVertex; *(CVectorPacked *) outVertex = *posIt + sM * CVector(*(CVectorPacked *) inVertex);
// copy the normal // copy the normal
*(CVectorPacked *) (outVertex + outNormalOff) = M * *(CVector *) (inVertex + inNormalOff); *(CVectorPacked *) (outVertex + outNormalOff) = M * CVector(*(CVectorPacked *) (inVertex + inNormalOff));
inVertex += inVSize; inVertex += inVSize;
@ -683,7 +683,7 @@ public:
CHECK_VERTEX_BUFFER(outVb, outVertex); CHECK_VERTEX_BUFFER(outVb, outVertex);
// translate and resize the vertex (relatively to the mesh origin) // translate and resize the vertex (relatively to the mesh origin)
*(CVectorPacked *) outVertex = *posIt + sM * *(CVector *) inVertex; *(CVectorPacked *) outVertex = *posIt + sM * CVector(*(CVectorPacked *) inVertex);
inVertex += inVSize; inVertex += inVSize;
outVertex += outVSize; outVertex += outVSize;
@ -774,10 +774,10 @@ public:
CHECK_VERTEX_BUFFER(outVb, outVertex + outNormalOff); CHECK_VERTEX_BUFFER(outVb, outVertex + outNormalOff);
// morph, and transform the vertex // morph, and transform the vertex
*(CVectorPacked *) outVertex = *posIt + sM * (opLambda * *(CVector *) m0 + lambda * *(CVector *) m1); *(CVectorPacked *) outVertex = *posIt + sM * (opLambda * CVector(*(CVectorPacked *) m0) + lambda * CVector(*(CVectorPacked *) m1));
// morph, and transform the normal // morph, and transform the normal
*(CVectorPacked *) (outVertex + outNormalOff) = M * (opLambda * *(CVector *) (m0 + inNormalOff) *(CVectorPacked *) (outVertex + outNormalOff) = M * (opLambda * CVector(*(CVectorPacked *) (m0 + inNormalOff))
+ lambda * *(CVector *) (m1 + inNormalOff)).normed(); + lambda * CVector(*(CVectorPacked *) (m1 + inNormalOff))).normed();
m0 += inVSize; m0 += inVSize;
@ -799,7 +799,7 @@ public:
CHECK_VERTEX_BUFFER((*inVB1), m1); CHECK_VERTEX_BUFFER((*inVB1), m1);
CHECK_VERTEX_BUFFER(outVb, outVertex); CHECK_VERTEX_BUFFER(outVb, outVertex);
// morph, and transform the vertex // morph, and transform the vertex
*(CVectorPacked *) outVertex = *posIt + sM * (opLambda * *(CVector *) m0 + opLambda * *(CVector *) m1); *(CVectorPacked *) outVertex = *posIt + sM * (opLambda * CVector(*(CVectorPacked *) m0) + opLambda * CVector(*(CVectorPacked *) m1));
m0 += inVSize; m0 += inVSize;
m1 += inVSize; m1 += inVSize;
@ -948,9 +948,9 @@ public:
// translate and resize the vertex (relatively to the mesh origin) // translate and resize the vertex (relatively to the mesh origin)
*(CVector *) outVertex = *posIt + *ptCurrSize * *(CVector *) inVertex; *(CVectorPacked *) outVertex = *posIt + *ptCurrSize * CVector(*(CVectorPacked *) inVertex);
// copy the normal // copy the normal
*(CVector *) (outVertex + normalOff ) = *(CVector *) (inVertex + pNormalOff); *(CVectorPacked *) (outVertex + normalOff ) = *(CVectorPacked *) (inVertex + pNormalOff);
inVertex += inVSize; inVertex += inVSize;
outVertex += outVSize; outVertex += outVSize;
} }
@ -963,7 +963,7 @@ public:
// translate and resize the vertex (relatively to the mesh origin) // translate and resize the vertex (relatively to the mesh origin)
CHECK_VERTEX_BUFFER(outVb, outVertex); CHECK_VERTEX_BUFFER(outVb, outVertex);
CHECK_VERTEX_BUFFER(prerotVb, inVertex); CHECK_VERTEX_BUFFER(prerotVb, inVertex);
*(CVector *) outVertex = *posIt + *ptCurrSize * *(CVector *) inVertex; *(CVectorPacked *) outVertex = *posIt + *ptCurrSize * CVector(*(CVectorPacked *) inVertex);
inVertex += inVSize; inVertex += inVSize;
outVertex += outVSize; outVertex += outVSize;
} }
@ -1684,8 +1684,8 @@ CVertexBuffer &CPSConstraintMesh::makePrerotatedVb(const CVertexBuffer &inVb)
CHECK_VERTEX_BUFFER(prerotatedVb, outVertex); CHECK_VERTEX_BUFFER(prerotatedVb, outVertex);
CHECK_VERTEX_BUFFER(prerotatedVb, outVertex + pNormalOff); CHECK_VERTEX_BUFFER(prerotatedVb, outVertex + pNormalOff);
* (CVectorPacked *) outVertex = mat.mulVector(* (CVector *) inVertex); * (CVectorPacked *) outVertex = mat.mulVector(* (CVectorPacked *) inVertex);
* (CVectorPacked *) (outVertex + normalOff) = mat.mulVector(* (CVector *) (inVertex + pNormalOff) ); * (CVectorPacked *) (outVertex + normalOff) = mat.mulVector(* (CVectorPacked *) (inVertex + pNormalOff) );
outVertex += vpSize; outVertex += vpSize;
inVertex += vSize; inVertex += vSize;
@ -1701,7 +1701,7 @@ CVertexBuffer &CPSConstraintMesh::makePrerotatedVb(const CVertexBuffer &inVb)
CHECK_VERTEX_BUFFER(prerotatedVb, outVertex); CHECK_VERTEX_BUFFER(prerotatedVb, outVertex);
CHECK_VERTEX_BUFFER(inVb, inVertex); CHECK_VERTEX_BUFFER(inVb, inVertex);
* (CVectorPacked *) outVertex = mat.mulVector(* (CVector *) inVertex); * (CVectorPacked *) outVertex = mat.mulVector(* (CVectorPacked *) inVertex);
outVertex += vpSize; outVertex += vpSize;
inVertex += vSize; inVertex += vSize;
} }

3
code/nel/src/sound/clustered_sound.cpp
Unescape Escape View File

@ -881,7 +881,8 @@ bool CClusteredSound::addAudibleCluster(CCluster *cluster, CClusterSoundStatus &
} }
else else
{ {
_AudibleClusters.insert(make_pair(cluster, soundStatus)); //_AudibleClusters.insert(make_pair(cluster, soundStatus));
_AudibleClusters[cluster] = soundStatus;
return true; return true;
} }

Write Preview
Loading…
Cancel
Save