Part 5 of the experiment to remove doug_lea_allocator.

Author: intorr

src/Layers/xrRender/DetailManager.cpp

@@ -346,9 +346,9 @@ void CDetailManager::UpdateVisibleM()
                         if (sp.id == DetailSlot::ID_Empty)
                             continue;
 
-                        sp.r_items[0].clear_not_free();
-                        sp.r_items[1].clear_not_free();
-                        sp.r_items[2].clear_not_free();
+                        sp.r_items[0].clear();
+                        sp.r_items[1].clear();
+                        sp.r_items[2].clear();
 
                         float R = objects[sp.id]->bv_sphere.R;
                         float Rq_drcp = R * R * dist_sq_rcp; // reordered expression for 'ssa' calc

src/Layers/xrRender/DetailManager_VS.cpp

@@ -323,7 +323,7 @@ void CDetailManager::hw_Render_dump(ref_constant x_array, u32 var_id, u32 lod_id
                 RCache.stat.r.s_details.add(dwCNT_verts);
             }
             // Clean up
-            vis.clear_not_free();
+            vis.clear();
         }
         vOffset += hw_BatchSize * Object.number_vertices;
         iOffset += hw_BatchSize * Object.number_indices;

src/Layers/xrRender/DetailManager_soft.cpp

@@ -146,7 +146,7 @@ void CDetailManager::soft_Render()
             }
         }
         // Clean up
-        _vis.clear_not_free();
+        _vis.clear();
     }
 }
 

src/Layers/xrRender/ParticleGroup.cpp

@@ -194,8 +194,8 @@ void CParticleGroup::SItem::Clear()
     //	Igor: zero all pointers! Previous code didn't zero _source_ pointers,
     //	just temporary ones.
     _effect = nullptr;
-    _children_related.clear_not_free();
-    _children_free.clear_not_free();
+    _children_related.clear();
+    _children_free.clear();
 }
 void CParticleGroup::SItem::StartRelatedChild(CParticleEffect* emitter, LPCSTR eff_name, PAPI::Particle& m)
 {

src/Layers/xrRender/Shader.cpp

@@ -128,16 +128,6 @@ void STextureList::clear()
     erase(begin(), end());
 }
 
-void STextureList::clear_not_free()
-{
-    iterator it = begin();
-    iterator it_e = end();
-    for (; it != it_e; ++it)
-        (*it).second.destroy();
-
-    erase(begin(), end());
-}
-
 u32 STextureList::find_texture_stage(const shared_str& TexName) const
 {
     u32 dwTextureStage = 0;

src/Layers/xrRender/Shader.h

@@ -42,7 +42,6 @@ struct ECORE_API STextureList : public xr_resource_flagged, public xr_vector<std
         return TRUE;
     }
     virtual void clear();
-    virtual void clear_not_free();
 
     // Avoid using this function.
     // If possible use precompiled texture list.

src/Layers/xrRender/SkeletonCustom.cpp

@@ -324,7 +324,7 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags)
                 std::sort(faces.begin(), faces.end());
                 auto new_end = std::unique(faces.begin(), faces.end());
                 faces.erase(new_end, faces.end());
-                B->child_faces[child_idx].clear_and_free();
+                B->child_faces[child_idx].clear();
                 B->child_faces[child_idx] = faces;
             }
         }

src/Layers/xrRenderDX10/3DFluid/dx103DFluidData.cpp

@@ -217,7 +217,7 @@ void dx103DFluidData::ParseProfile(const xr_string& Profile)
 #ifdef DEBUG
 void dx103DFluidData::ReparseProfile(const xr_string& Profile)
 {
-    m_Emitters.clear_not_free();
+    m_Emitters.clear();
     ParseProfile(Profile);
 }
 #endif //   DEBUG

src/Layers/xrRenderDX10/3DFluid/dx103DFluidObstacles.cpp

@@ -169,9 +169,9 @@ void dx103DFluidObstacles::ProcessStaticObstacles(const dx103DFluidData& FluidDa
 void dx103DFluidObstacles::ProcessDynamicObstacles(
     const dx103DFluidData& FluidData, const Fmatrix& WorldToFluid, float timestep)
 {
-    m_lstRenderables.clear_not_free();
-    m_lstShells.clear_not_free();
-    m_lstElements.clear_not_free();
+    m_lstRenderables.clear();
+    m_lstShells.clear();
+    m_lstElements.clear();
 
     Fbox box;
     box.vMin = Fvector3().set(-0.5f, -0.5f, -0.5f);

src/Layers/xrRenderDX10/3DFluid/dx103DFluidRenderer.cpp

@@ -787,7 +787,7 @@ void dx103DFluidRenderer::DrawBox()
 
 void dx103DFluidRenderer::CalculateLighting(const dx103DFluidData& FluidData, FogLighting& LightData)
 {
-    m_lstRenderables.clear_not_free();
+    m_lstRenderables.clear();
 
     LightData.Reset();