Prim generation: fixes from a review of the stack

indra/llappearance/llavatarappearance.cpp

@@ -1128,12 +1128,16 @@ bool LLAvatarAppearance::loadMeshNodes()
 
         LLPolyMesh *poly_mesh = NULL;
 
+        // Hair, skirt and eyelashes are drawn blended, and keep the order
+        // their triangles were made in.
+        const bool blended = mesh_id == MESH_ID_HAIR || mesh_id == MESH_ID_SKIRT || mesh_id == MESH_ID_EYELASH;
+
         if (!info->mReferenceMeshName.empty())
         {
             polymesh_map_t::const_iterator polymesh_iter = mPolyMeshes.find(info->mReferenceMeshName);
             if (polymesh_iter != mPolyMeshes.end())
             {
-                poly_mesh = LLPolyMesh::getMesh(info->mMeshFileName, polymesh_iter->second);
+                poly_mesh = LLPolyMesh::getMesh(info->mMeshFileName, polymesh_iter->second, blended);
                 poly_mesh->setAvatar(this);
             }
             else
@@ -1145,7 +1149,7 @@ bool LLAvatarAppearance::loadMeshNodes()
         }
         else
         {
-            poly_mesh = LLPolyMesh::getMesh(info->mMeshFileName);
+            poly_mesh = LLPolyMesh::getMesh(info->mMeshFileName, NULL, blended);
             poly_mesh->setAvatar(this);
         }
 

indra/llappearance/llpolymesh.cpp

@@ -270,7 +270,7 @@ bool LLPolyMeshSharedData::allocateJointNames( U32 numJointNames )
 //--------------------------------------------------------------------
 // LLPolyMeshSharedData::loadMesh()
 //--------------------------------------------------------------------
-bool LLPolyMeshSharedData::loadMesh( const std::string& fileName )
+bool LLPolyMeshSharedData::loadMesh( const std::string& fileName, bool keep_order )
 {
         //-------------------------------------------------------------------------
         // Open the file
@@ -565,7 +565,7 @@ bool LLPolyMeshSharedData::loadMesh( const std::string& fileName )
                 // weights address vertices, which keep their order, and an
                 // LOD's faces are its own.
                 const U32 vertex_count = (U32)mNumVertices;
-                bool in_range = numFaces > 0;
+                bool in_range = numFaces > 0 && !keep_order;
                 for (i = 0; i < (U32)numFaces * 3 && in_range; i++)
                 {
                         in_range = (U32)mFaces[i / 3][i % 3] < vertex_count;
@@ -835,7 +835,7 @@ LLPolyMesh::~LLPolyMesh()
 //-----------------------------------------------------------------------------
 // LLPolyMesh::getMesh()
 //-----------------------------------------------------------------------------
-LLPolyMesh *LLPolyMesh::getMesh(const std::string &name, LLPolyMesh* reference_mesh)
+LLPolyMesh *LLPolyMesh::getMesh(const std::string &name, LLPolyMesh* reference_mesh, bool keep_order)
 {
         //-------------------------------------------------------------------------
         // search for an existing mesh by this name
@@ -859,7 +859,7 @@ LLPolyMesh *LLPolyMesh::getMesh(const std::string &name, LLPolyMesh* reference_m
         {
                 mesh_data->setupLOD(reference_mesh->getSharedData());
         }
-        if ( ! mesh_data->loadMesh( full_path ) )
+        if ( ! mesh_data->loadMesh( full_path, keep_order ) )
         {
                 delete mesh_data;
                 return NULL;

indra/llappearance/llpolymesh.h

@@ -128,8 +128,10 @@ class LLPolyMeshSharedData
     // Retrieve the number of KB of memory used by this instance
     U32 getNumKB();
 
-    // Load mesh data from file
-    bool loadMesh( const std::string& fileName );
+    // Load mesh data from file. Its triangles are ordered for the vertex
+    // cache unless keep_order is set, for a mesh drawn blended, whose
+    // triangles blend over one another in the order they were made in.
+    bool loadMesh( const std::string& fileName, bool keep_order = false );
 
 public:
     void genIndices(S32 offset);
@@ -170,7 +172,8 @@ class LLPolyMesh
     // Requests a mesh by name.
     // If the mesh already exists in the global mesh table, it is returned,
     // otherwise it is loaded from file, added to the table, and returned.
-    static LLPolyMesh *getMesh( const std::string &name, LLPolyMesh* reference_mesh = NULL);
+    // keep_order is loadMesh's.
+    static LLPolyMesh *getMesh( const std::string &name, LLPolyMesh* reference_mesh = NULL, bool keep_order = false);
 
     // Frees all loaded meshes.
     // This should only be called once you know there are no outstanding

indra/llmath/CMakeLists.txt

@@ -109,13 +109,16 @@ target_precompile_headers(llmath REUSE_FROM llprecompiled)
 # compiler may round one sum differently at each place it inlines it, and a
 # touch would then land a unit in the last place from the coordinate its
 # vertex is drawn with. MSVC is held to the same by the float_control pragma
-# around the kernels in alsimdkernels.inl.
-if(NOT COMPILER_IS_MSVC AND NOT COMPILER_IS_CLANG_CL)
+# around the kernels in alsimdkernels.inl, which clang-cl does not take, and
+# clang-cl by the same options as Clang.
+set(AL_STRICT_FP_OPTIONS "-ffp-contract=off;-fno-associative-math;-fno-reciprocal-math")
+if(COMPILER_IS_CLANG_CL)
+  list(TRANSFORM AL_STRICT_FP_OPTIONS PREPEND "/clang:")
+endif()
+if(NOT COMPILER_IS_MSVC)
   set_source_files_properties(
     alsimdplanar.cpp
-    PROPERTIES
-      COMPILE_OPTIONS "-ffp-contract=off;-fno-associative-math;-fno-reciprocal-math"
-      SKIP_PRECOMPILE_HEADERS TRUE
+    PROPERTIES COMPILE_OPTIONS "${AL_STRICT_FP_OPTIONS}" SKIP_PRECOMPILE_HEADERS TRUE
   )
 endif()
 
@@ -172,10 +175,10 @@ if(AL_BUILD_TESTS)
   # intrinsics, and the file passes there as it is. Accuracy against a double
   # reference, and the library's own entry built as the viewer has it, are
   # checked to a tolerance.
-  if(NOT COMPILER_IS_MSVC AND NOT COMPILER_IS_CLANG_CL)
+  if(NOT COMPILER_IS_MSVC)
     set_source_files_properties(
       tests/alsimdkernels_test.cpp
-      PROPERTIES COMPILE_OPTIONS "-ffp-contract=off;-fno-associative-math;-fno-reciprocal-math"
+      PROPERTIES COMPILE_OPTIONS "${AL_STRICT_FP_OPTIONS}"
     )
   endif()