Преглед изворни кода

Merge pull request #1801 from Azaezel/registerRemoval

clang: register type modifier deprecated
Anis пре 8 година
родитељ
комит
bd4f2b002d

+ 3 - 3
Engine/source/collision/clippedPolyList.cpp

@@ -96,9 +96,9 @@ U32 ClippedPolyList::addPointAndNormal(const Point3F& p, const Point3F& normal)
     AssertFatal(mNormalList.size() == mVertexList.size(), "Normals count does not match vertex count!");    
 
    // Build the plane mask
-   register U32      mask = 1;
-   register S32      count = mPlaneList.size();
-   register PlaneF * plane = mPlaneList.address();
+   U32      mask = 1;
+   S32      count = mPlaneList.size();
+   PlaneF * plane = mPlaneList.address();
 
    v.mask = 0;
    while(--count >= 0) {

+ 1 - 1
Engine/source/collision/convex.cpp

@@ -531,7 +531,7 @@ void Convex::updateStateList(const MatrixF& mat, const Point3F& scale, const Poi
 
    // Add collision states for new overlapping objects
    for (CollisionWorkingList* itr0 = mWorking.wLink.mNext; itr0 != &mWorking; itr0 = itr0->wLink.mNext) {
-      register Convex* cv = itr0->mConvex;
+      Convex* cv = itr0->mConvex;
       if (cv->mTag != sTag && box1.isOverlapped(cv->getBoundingBox())) {
          CollisionState* state = new GjkCollisionState;
          state->set(this,cv,mat,cv->getTransform());

+ 4 - 4
Engine/source/core/util/hashFunction.cpp

@@ -104,9 +104,9 @@ acceptable.  Do NOT use for cryptographic purposes.
 --------------------------------------------------------------------
 */
 
-U32 hash(register const U8 *k, register U32 length, register U32 initval)
+U32 hash(const U8 *k, U32 length, U32 initval)
 {
-   register U32 a,b,c,len;
+   U32 a,b,c,len;
 
    /* Set up the internal state */
    len = length;
@@ -211,9 +211,9 @@ is acceptable.  Do NOT use for cryptographic purposes.
 --------------------------------------------------------------------
 */
 
-U64 hash64( register const U8 *k, register U32 length, register U64 initval )
+U64 hash64( const U8 *k, U32 length, U64 initval )
 {
-  register U64 a,b,c,len;
+  U64 a,b,c,len;
 
   /* Set up the internal state */
   len = length;

+ 1 - 1
Engine/source/core/util/md5.cpp

@@ -177,7 +177,7 @@ void MD5Final( unsigned char digest[16], MD5Context* ctx)
  */
 void MD5Transform( int buf[4], int in[16])
 {
-    register int a, b, c, d;
+    int a, b, c, d;
 
     a = buf[0];
     b = buf[1];

+ 4 - 4
Engine/source/ts/arch/tsMeshIntrinsics.sse.cpp

@@ -28,11 +28,11 @@
 void zero_vert_normal_bulk_SSE(const dsize_t count, U8 * __restrict const outPtr, const dsize_t outStride)
 {
    // A U8 * version of the in/out pointer
-   register char *outData = reinterpret_cast<char *>(outPtr);
+   char *outData = reinterpret_cast<char *>(outPtr);
    
-   register __m128 vPos;
-   register __m128 vNrm;
-   register __m128 vMask;
+   __m128 vPos;
+   __m128 vNrm;
+   __m128 vMask;
 
    const __m128 _point3f_zero_mask = { 0.0f, 0.0f, 0.0f, 1.0f };
    vMask = _mm_load_ps((const F32*)&_point3f_zero_mask);

+ 2 - 2
Engine/source/ts/tsMesh.cpp

@@ -1244,8 +1244,8 @@ void TSSkinMesh::updateSkinBuffer( const Vector<MatrixF> &transforms, U8* buffer
 
    AssertFatal(batchData.vertexBatchOperations.size() == batchData.initialVerts.size(), "Assumption failed!");
 
-   register Point3F skinnedVert;
-   register Point3F skinnedNorm;
+   Point3F skinnedVert;
+   Point3F skinnedNorm;
 
    for (Vector<BatchData::BatchedVertex>::const_iterator itr = batchData.vertexBatchOperations.begin();
       itr != batchData.vertexBatchOperations.end(); itr++)

+ 2 - 2
Engine/source/ts/tsMeshIntrinsics.cpp

@@ -33,11 +33,11 @@ void (*zero_vert_normal_bulk)(const dsize_t count, U8 * __restrict const outPtr,
 
 void zero_vert_normal_bulk_C(const dsize_t count, U8 * __restrict const outPtr, const dsize_t outStride)
 {
-   register char *outData = reinterpret_cast<char *>(outPtr);
+   char *outData = reinterpret_cast<char *>(outPtr);
 
    // TODO: Try prefetch w/ ptr de-reference
 
-   for(register S32 i = 0; i < count; i++)
+   for(S32 i = 0; i < count; i++)
    {
       TSMesh::__TSMeshVertexBase *outElem = reinterpret_cast<TSMesh::__TSMeshVertexBase *>(outData);
       outElem->_vert.zero();