Text archives Help

---

Author: sparker
Date: Sat Jun 10 00:36:12 2006
New Revision: 1115

Modified:
   trunk/Model/Primitives/Sphere.cc
Log:
Fix 32 bit SSE build (cut/paste error)


Modified: trunk/Model/Primitives/Sphere.cc
==============================================================================
--- trunk/Model/Primitives/Sphere.cc    (original)
+++ trunk/Model/Primitives/Sphere.cc    Sat Jun 10 00:36:12 2006
@@ -147,9 +147,9 @@
              _mm_maskmoveu_si128(_mm_set1_epi64x((long)getTexCoordMapper()), 
lohit, (char*)&data->hitTex[i]);
              _mm_maskmoveu_si128(_mm_set1_epi64x((long)getTexCoordMapper()), 
hihit, (char*)&data->hitTex[i+2]);
 #else
-             _mm_maskmoveu_si128(_mm_set1_epi32((int)getMaterial()), 
(__m128i)hit, (char*)&data->hitMatl[i]);
-             _mm_maskmoveu_si128(_mm_set1_epi32((int)this), (__m128i)hit, 
(char*)&data->hitPrim[i]);
-             _mm_maskmoveu_si128(_mm_set1_epi32((int)getTexCoordMapper()), 
(__m128i)hit, (char*)&data->hitTex[i]);
+             _mm_maskmoveu_si128(_mm_set1_epi32((int)getMaterial()), 
(__m128i)hit0, (char*)&data->hitMatl[i]);
+             _mm_maskmoveu_si128(_mm_set1_epi32((int)this), (__m128i)hit0, 
(char*)&data->hitPrim[i]);
+             _mm_maskmoveu_si128(_mm_set1_epi32((int)getTexCoordMapper()), 
(__m128i)hit0, (char*)&data->hitTex[i]);
 #endif
            }
             // Mask off rays that successfully hit at t0
@@ -188,9 +188,9 @@
            _mm_maskmoveu_si128(_mm_set1_epi64x((long)getTexCoordMapper()), 
lohit, (char*)&data->hitTex[i]);
            _mm_maskmoveu_si128(_mm_set1_epi64x((long)getTexCoordMapper()), 
hihit, (char*)&data->hitTex[i+2]);
 #else
-           _mm_maskmoveu_si128(_mm_set1_epi32((int)getMaterial()), 
(__m128i)hit, (char*)&data->hitMatl[i]);
-           _mm_maskmoveu_si128(_mm_set1_epi32((int)this), (__m128i)hit, 
(char*)&data->hitPrim[i]);
-           _mm_maskmoveu_si128(_mm_set1_epi32((int)getTexCoordMapper()), 
(__m128i)hit, (char*)&data->hitTex[i]);
+           _mm_maskmoveu_si128(_mm_set1_epi32((int)getMaterial()), 
(__m128i)hit1, (char*)&data->hitMatl[i]);
+           _mm_maskmoveu_si128(_mm_set1_epi32((int)this), (__m128i)hit1, 
(char*)&data->hitPrim[i]);
+           _mm_maskmoveu_si128(_mm_set1_epi32((int)getTexCoordMapper()), 
(__m128i)hit1, (char*)&data->hitTex[i]);
 #endif
          }
         }
@@ -342,9 +342,9 @@
              _mm_maskmoveu_si128(_mm_set1_epi64x((long)getTexCoordMapper()), 
lohit, (char*)&data->hitTex[i]);
              _mm_maskmoveu_si128(_mm_set1_epi64x((long)getTexCoordMapper()), 
hihit, (char*)&data->hitTex[i+2]);
 #else
-             _mm_maskmoveu_si128(_mm_set1_epi32((int)getMaterial()), 
(__m128i)hit, (char*)&data->hitMatl[i]);
-             _mm_maskmoveu_si128(_mm_set1_epi32((int)this), (__m128i)hit, 
(char*)&data->hitPrim[i]);
-             _mm_maskmoveu_si128(_mm_set1_epi32((int)getTexCoordMapper()), 
(__m128i)hit, (char*)&data->hitTex[i]);
+             _mm_maskmoveu_si128(_mm_set1_epi32((int)getMaterial()), 
(__m128i)hit0, (char*)&data->hitMatl[i]);
+             _mm_maskmoveu_si128(_mm_set1_epi32((int)this), (__m128i)hit0, 
(char*)&data->hitPrim[i]);
+             _mm_maskmoveu_si128(_mm_set1_epi32((int)getTexCoordMapper()), 
(__m128i)hit0, (char*)&data->hitTex[i]);
 #endif
            }
             // Mask off rays that successfully hit at t0
@@ -383,9 +383,9 @@
            _mm_maskmoveu_si128(_mm_set1_epi64x((long)getTexCoordMapper()), 
lohit, (char*)&data->hitTex[i]);
            _mm_maskmoveu_si128(_mm_set1_epi64x((long)getTexCoordMapper()), 
hihit, (char*)&data->hitTex[i+2]);
 #else
-           _mm_maskmoveu_si128(_mm_set1_epi32((int)getMaterial()), 
(__m128i)hit, (char*)&data->hitMatl[i]);
-           _mm_maskmoveu_si128(_mm_set1_epi32((int)this), (__m128i)hit, 
(char*)&data->hitPrim[i]);
-           _mm_maskmoveu_si128(_mm_set1_epi32((int)getTexCoordMapper()), 
(__m128i)hit, (char*)&data->hitTex[i]);
+           _mm_maskmoveu_si128(_mm_set1_epi32((int)getMaterial()), 
(__m128i)hit1, (char*)&data->hitMatl[i]);
+           _mm_maskmoveu_si128(_mm_set1_epi32((int)this), (__m128i)hit1, 
(char*)&data->hitPrim[i]);
+           _mm_maskmoveu_si128(_mm_set1_epi32((int)getTexCoordMapper()), 
(__m128i)hit1, (char*)&data->hitTex[i]);
 #endif
          }
         }

---

• [MANTA] r1115 - trunk/Model/Primitives, sparker, 06/10/2006

---

Archive powered by MHonArc 2.6.16.