From 7ceaaf09fdf3c7f44f82be5122021b53949ba320 Mon Sep 17 00:00:00 2001 From: Igor Novikov Date: Thu, 21 Dec 2017 22:16:06 +0500 Subject: [PATCH] Part 2 of the experiment to remove doug_lea_allocator. --- src/Layers/xrRender/D3DXRenderBase.h | 8 ++-- src/Layers/xrRender/RenderAllocator.cpp | 12 ----- src/Layers/xrRender/RenderAllocator.hpp | 14 ------ src/Layers/xrRender/r__dsgraph_render.cpp | 30 ++++++------- src/Layers/xrRender/r__dsgraph_types.h | 45 +++++++++---------- src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj | 2 - .../xrRenderPC_R1/xrRender_R1.vcxproj.filters | 6 --- src/Layers/xrRenderPC_R2/r2.h | 2 +- src/Layers/xrRenderPC_R2/r2_R_sun.cpp | 6 +-- src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj | 2 - .../xrRenderPC_R2/xrRender_R2.vcxproj.filters | 6 --- src/Layers/xrRenderPC_R3/r3.h | 2 +- src/Layers/xrRenderPC_R3/r3_R_sun.cpp | 6 +-- src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj | 2 - .../xrRenderPC_R3/xrRender_R3.vcxproj.filters | 6 --- src/Layers/xrRenderPC_R4/r4.h | 2 +- src/Layers/xrRenderPC_R4/r4_R_sun.cpp | 6 +-- src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj | 2 - .../xrRenderPC_R4/xrRender_R4.vcxproj.filters | 6 --- src/xrCore/Memory/memory_allocator_options.h | 1 - 20 files changed, 53 insertions(+), 113 deletions(-) delete mode 100644 src/Layers/xrRender/RenderAllocator.cpp delete mode 100644 src/Layers/xrRender/RenderAllocator.hpp diff --git a/src/Layers/xrRender/D3DXRenderBase.h b/src/Layers/xrRender/D3DXRenderBase.h index eebdff3f67f..bd5054154d5 100644 --- a/src/Layers/xrRender/D3DXRenderBase.h +++ b/src/Layers/xrRender/D3DXRenderBase.h @@ -24,7 +24,7 @@ class D3DXRenderBase : public IRender, public pureFrame BOOL val_bRecordMP; // record nearest for multi-pass R_feedback* val_feedback; // feedback for geometry being rendered u32 val_feedback_breakp; // breakpoint - xr_vector>* val_recorder; // coarse structure recorder + xr_vector* val_recorder; // coarse structure recorder u32 phase; u32 marker; bool pmask[2]; @@ -47,8 +47,8 @@ class D3DXRenderBase : public IRender, public pureFrame R_dsgraph::mapSorted_T mapHUDEmissive; #endif - xr_vector> lstLODs; - xr_vector> lstLODgroups; + xr_vector lstLODs; + xr_vector lstLODgroups; xr_vector lstRenderables; xr_vector lstSpatial; @@ -75,7 +75,7 @@ class D3DXRenderBase : public IRender, public pureFrame val_feedback_breakp = id; val_feedback = V; } - void set_Recorder(xr_vector>* dest) + void set_Recorder(xr_vector* dest) { val_recorder = dest; if (dest) diff --git a/src/Layers/xrRender/RenderAllocator.cpp b/src/Layers/xrRender/RenderAllocator.cpp deleted file mode 100644 index 3ed3b2cf888..00000000000 --- a/src/Layers/xrRender/RenderAllocator.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "stdafx.h" -#include "RenderAllocator.hpp" - -#ifdef USE_DOUG_LEA_ALLOCATOR_FOR_RENDER -#ifdef USE_ARENA_ALLOCATOR -static const u32 s_arena_size = 8 * 1024 * 1024; -static char s_fake_array[s_arena_size]; -doug_lea_allocator g_render_allocator(s_fake_array, s_arena_size, "render"); -#else -doug_lea_allocator g_render_allocator(nullptr, 0, "render"); -#endif -#endif diff --git a/src/Layers/xrRender/RenderAllocator.hpp b/src/Layers/xrRender/RenderAllocator.hpp deleted file mode 100644 index 59964f28b4c..00000000000 --- a/src/Layers/xrRender/RenderAllocator.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once -#include "xrCore/Memory/doug_lea_allocator.h" - -#ifdef USE_DOUG_LEA_ALLOCATOR_FOR_RENDER -extern doug_lea_allocator g_render_allocator; - -template -using render_alloc = doug_lea_alloc; -using render_allocator = doug_lea_allocator_wrapper; -#else -template -using render_alloc = xalloc; -using render_allocator = xr_allocator; -#endif diff --git a/src/Layers/xrRender/r__dsgraph_render.cpp b/src/Layers/xrRender/r__dsgraph_render.cpp index ef0e86c07d7..332c48912ac 100644 --- a/src/Layers/xrRender/r__dsgraph_render.cpp +++ b/src/Layers/xrRender/r__dsgraph_render.cpp @@ -70,7 +70,7 @@ template IC bool cmp_textures_lexN(const T &lhs, const T &rhs) return std::lexicographical_compare(t1->begin(), t1->end(), t2->begin(), t2->end()); } -template void sort_tlist(xr_vector>& lst, T& textures) +template void sort_tlist(xr_vector& lst, T& textures) { int amount = textures.begin()->key->size(); @@ -82,7 +82,7 @@ template void sort_tlist(xr_vector> temp; + xr_vector temp; // Split into 2 parts for (auto &it : textures) @@ -123,7 +123,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) { mapNormalVS& vs = mapNormalPasses[_priority][iPass]; - xr_vector> nrmVS; + xr_vector nrmVS; vs.getANY_P(nrmVS); std::sort(nrmVS.begin(), nrmVS.end(), cmp_val_ssa); for (auto & vs_it : nrmVS) @@ -134,7 +134,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) // GS setup mapNormalGS& gs = vs_it->val; - xr_vector> nrmGS; + xr_vector nrmGS; gs.getANY_P(nrmGS); std::sort(nrmGS.begin(), nrmGS.end(), cmp_val_ssa); for (auto & gs_it : nrmGS) @@ -145,7 +145,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) #else // USE_DX10 mapNormalPS& ps = vs_it->val; #endif // USE_DX10 - xr_vector> nrmPS; + xr_vector nrmPS; ps.getANY_P(nrmPS); std::sort(nrmPS.begin(), nrmPS.end(), cmp_ps_val_ssa); for (auto &ps_it : nrmPS) @@ -159,7 +159,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) #else mapNormalCS& cs = ps_it->val; #endif - xr_vector> nrmCS; + xr_vector nrmCS; cs.getANY_P(nrmCS); std::sort(nrmCS.begin(), nrmCS.end(), cmp_val_ssa); for (auto &cs_it : nrmCS) @@ -168,7 +168,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) mapNormalStates& states = cs_it->val; - xr_vector> nrmStates; + xr_vector nrmStates; states.getANY_P(nrmStates); std::sort(nrmStates.begin(), nrmStates.end(), cmp_val_ssa); for (auto &state_it : nrmStates) @@ -177,7 +177,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) mapNormalTextures& tex = state_it->val; - xr_vector> nrmTextures; + xr_vector nrmTextures; sort_tlist(nrmTextures, tex); for (auto &tex_it : nrmTextures) { @@ -221,7 +221,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) { mapMatrixVS& vs = mapMatrixPasses[_priority][iPass]; - xr_vector> matVS; + xr_vector matVS; vs.getANY_P(matVS); std::sort(matVS.begin(), matVS.end(), cmp_val_ssa); for (auto &vs_id : matVS) @@ -231,7 +231,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) #if defined(USE_DX10) || defined(USE_DX11) mapMatrixGS& gs = vs_id->val; - xr_vector> matGS; + xr_vector matGS; gs.getANY_P(matGS); std::sort(matGS.begin(), matGS.end(), cmp_val_ssa); for (auto &gs_it : matGS) @@ -242,7 +242,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) #else // USE_DX10 mapMatrixPS& ps = vs_id->val; #endif // USE_DX10 - xr_vector> matPS; + xr_vector matPS; ps.getANY_P(matPS); std::sort(matPS.begin(), matPS.end(), cmp_ps_val_ssa); for (auto &ps_it : matPS) @@ -256,7 +256,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) #else mapMatrixCS& cs = ps_it->val; #endif - xr_vector> matCS; + xr_vector matCS; cs.getANY_P(matCS); std::sort(matCS.begin(), matCS.end(), cmp_val_ssa); for (auto &cs_it : matCS) @@ -265,7 +265,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) mapMatrixStates& states = cs_it->val; - xr_vector> matStates; + xr_vector matStates; states.getANY_P(matStates); std::sort(matStates.begin(), matStates.end(), cmp_val_ssa); for (auto &state_it : matStates) @@ -274,7 +274,7 @@ void D3DXRenderBase::r_dsgraph_render_graph(u32 _priority) mapMatrixTextures& tex = state_it->val; - xr_vector> matTextures; + xr_vector matTextures; sort_tlist(matTextures, tex); for (auto &tex_it : matTextures) { @@ -603,7 +603,7 @@ void D3DXRenderBase::r_dsgraph_render_subspace(IRender_Sector* _sector, CFrustum void D3DXRenderBase::r_dsgraph_render_R1_box(IRender_Sector* S, Fbox& BB, int sh) { - xr_vector> lstVisuals; + xr_vector lstVisuals; lstVisuals.push_back(((CSector*)S)->root()); for (auto &it : lstVisuals) diff --git a/src/Layers/xrRender/r__dsgraph_types.h b/src/Layers/xrRender/r__dsgraph_types.h index e71e8754546..81981c7fe60 100644 --- a/src/Layers/xrRender/r__dsgraph_types.h +++ b/src/Layers/xrRender/r__dsgraph_types.h @@ -1,7 +1,6 @@ #pragma once -#include "xrCore/fixedmap.h" -#include "Layers/xrRender/RenderAllocator.hpp" +#include "xrCore/FixedMap.h" class dxRender_Visual; @@ -61,24 +60,24 @@ using ps_type = ID3DPixelShader* ; #endif // NORMAL -using mapNormalDirect = xr_vector<_NormalItem, render_allocator::helper<_NormalItem>::result>; +using mapNormalDirect = xr_vector<_NormalItem>; struct mapNormalItems : public mapNormalDirect { float ssa; }; -struct mapNormalTextures : public FixedMAP +struct mapNormalTextures : public FixedMAP { float ssa; }; -struct mapNormalStates : public FixedMAP +struct mapNormalStates : public FixedMAP { float ssa; }; -struct mapNormalCS : public FixedMAP +struct mapNormalCS : public FixedMAP { float ssa; }; @@ -91,50 +90,50 @@ struct mapNormalAdvStages mapNormalCS mapCS; }; -struct mapNormalPS : public FixedMAP +struct mapNormalPS : public FixedMAP { float ssa; }; #else -struct mapNormalPS : public FixedMAP +struct mapNormalPS : public FixedMAP { float ssa; }; #endif // USE_DX11 #if defined(USE_DX10) || defined(USE_DX11) -struct mapNormalGS : public FixedMAP +struct mapNormalGS : public FixedMAP { float ssa; }; -struct mapNormalVS : public FixedMAP {}; +struct mapNormalVS : public FixedMAP {}; #else // USE_DX10 -struct mapNormalVS : public FixedMAP {}; +struct mapNormalVS : public FixedMAP {}; #endif // USE_DX10 using mapNormal_T = mapNormalVS; using mapNormalPasses_T = mapNormal_T[SHADER_PASSES_MAX]; // MATRIX -using mapMatrixDirect = xr_vector<_MatrixItem, render_allocator::helper<_MatrixItem>::result>; +using mapMatrixDirect = xr_vector<_MatrixItem>; struct mapMatrixItems : public mapMatrixDirect { float ssa; }; -struct mapMatrixTextures : public FixedMAP +struct mapMatrixTextures : public FixedMAP { float ssa; }; -struct mapMatrixStates : public FixedMAP +struct mapMatrixStates : public FixedMAP { float ssa; }; -struct mapMatrixCS : public FixedMAP +struct mapMatrixCS : public FixedMAP { float ssa; }; @@ -147,38 +146,38 @@ struct mapMatrixAdvStages mapMatrixCS mapCS; }; -struct mapMatrixPS : public FixedMAP +struct mapMatrixPS : public FixedMAP { float ssa; }; #else -struct mapMatrixPS : public FixedMAP +struct mapMatrixPS : public FixedMAP { float ssa; }; #endif // USE_DX11 #if defined(USE_DX10) || defined(USE_DX11) -struct mapMatrixGS : public FixedMAP +struct mapMatrixGS : public FixedMAP { float ssa; }; -struct mapMatrixVS : public FixedMAP {}; +struct mapMatrixVS : public FixedMAP {}; #else // USE_DX10 -struct mapMatrixVS : public FixedMAP {}; +struct mapMatrixVS : public FixedMAP {}; #endif // USE_DX10 using mapMatrix_T = mapMatrixVS; using mapMatrixPasses_T = mapMatrix_T[SHADER_PASSES_MAX]; // Top level -using mapSorted_T = FixedMAP; +using mapSorted_T = FixedMAP; using mapSorted_Node = mapSorted_T::TNode; -using mapHUD_T = FixedMAP; +using mapHUD_T = FixedMAP; using mapHUD_Node = mapHUD_T::TNode; -using mapLOD_T = FixedMAP; +using mapLOD_T = FixedMAP; using mapLOD_Node = mapLOD_T::TNode; } diff --git a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj index a0d3f2cabee..32b93cf9e84 100644 --- a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj +++ b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj @@ -251,7 +251,6 @@ - @@ -372,7 +371,6 @@ - diff --git a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj.filters b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj.filters index 4506ed09eaf..e04749fba7a 100644 --- a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj.filters +++ b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj.filters @@ -579,9 +579,6 @@ Core - - Core - @@ -968,9 +965,6 @@ Models\Visuals - - Core - diff --git a/src/Layers/xrRenderPC_R2/r2.h b/src/Layers/xrRenderPC_R2/r2.h index 270880470b1..8f277a65038 100644 --- a/src/Layers/xrRenderPC_R2/r2.h +++ b/src/Layers/xrRenderPC_R2/r2.h @@ -136,7 +136,7 @@ class CRender : public D3DXRenderBase light_Package LP_normal; light_Package LP_pending; - xr_vector> main_coarse_structure; + xr_vector main_coarse_structure; shared_str c_sbase; shared_str c_lmaterial; diff --git a/src/Layers/xrRenderPC_R2/r2_R_sun.cpp b/src/Layers/xrRenderPC_R2/r2_R_sun.cpp index a9612a774d6..8e2a61b0223 100644 --- a/src/Layers/xrRenderPC_R2/r2_R_sun.cpp +++ b/src/Layers/xrRenderPC_R2/r2_R_sun.cpp @@ -688,7 +688,7 @@ struct DumbClipper { return D3DXVECTOR3(i&1 ? bb.vMin.x : bb.vMax.x, i&2 ? bb.vMin.y : bb.vMax.y, i&4 ? bb.vMin.z : bb.vMax.z); } - Fbox clipped_AABB(xr_vector>& src, Fmatrix& xf) + Fbox clipped_AABB(xr_vector& src, Fmatrix& xf) { Fbox3 result; result.invalidate(); @@ -732,7 +732,7 @@ struct DumbClipper } }; -xr_vector> s_casters; +xr_vector s_casters; D3DXVECTOR2 BuildTSMProjectionMatrix_caster_depth_bounds(D3DXMATRIX& lightSpaceBasis) { @@ -865,7 +865,7 @@ void CRender::render_sun() } // Fill the database - xr_vector>& s_receivers = main_coarse_structure; + xr_vector& s_receivers = main_coarse_structure; s_casters.reserve(s_receivers.size()); set_Recorder(&s_casters); r_dsgraph_render_subspace(cull_sector, &cull_frustum, cull_xform, cull_COP, TRUE); diff --git a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj index 29e7f7dba1b..1b92aaf7ef1 100644 --- a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj +++ b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj @@ -253,7 +253,6 @@ - @@ -383,7 +382,6 @@ - diff --git a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj.filters b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj.filters index 393da043ede..fdd184bf179 100644 --- a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj.filters +++ b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj.filters @@ -615,9 +615,6 @@ Core - - Core - @@ -1103,9 +1100,6 @@ Interfase implementations\UI\UISequenceVideoItem - - Core - diff --git a/src/Layers/xrRenderPC_R3/r3.h b/src/Layers/xrRenderPC_R3/r3.h index 278249a0f32..939f8bdbfd7 100644 --- a/src/Layers/xrRenderPC_R3/r3.h +++ b/src/Layers/xrRenderPC_R3/r3.h @@ -169,7 +169,7 @@ class CRender : public D3DXRenderBase light_Package LP_normal; light_Package LP_pending; - xr_vector> main_coarse_structure; + xr_vector main_coarse_structure; shared_str c_sbase; shared_str c_lmaterial; diff --git a/src/Layers/xrRenderPC_R3/r3_R_sun.cpp b/src/Layers/xrRenderPC_R3/r3_R_sun.cpp index a6b5b37f037..4afac5b7995 100644 --- a/src/Layers/xrRenderPC_R3/r3_R_sun.cpp +++ b/src/Layers/xrRenderPC_R3/r3_R_sun.cpp @@ -248,7 +248,7 @@ struct DumbClipper return D3DXVECTOR3((i & 1) ? bb.vMin.x : bb.vMax.x, (i & 2) ? bb.vMin.y : bb.vMax.y, (i & 4) ? bb.vMin.z : bb.vMax.z); } - Fbox clipped_AABB(xr_vector>& src, Fmatrix& xf) + Fbox clipped_AABB(xr_vector& src, Fmatrix& xf) { Fbox3 result; result.invalidate(); @@ -292,7 +292,7 @@ struct DumbClipper } }; -xr_vector> s_casters; +xr_vector s_casters; D3DXVECTOR2 BuildTSMProjectionMatrix_caster_depth_bounds(D3DXMATRIX& lightSpaceBasis) { @@ -427,7 +427,7 @@ void CRender::render_sun() } // Fill the database - xr_vector>& s_receivers = main_coarse_structure; + xr_vector& s_receivers = main_coarse_structure; s_casters.reserve(s_receivers.size()); set_Recorder(&s_casters); r_dsgraph_render_subspace(cull_sector, &cull_frustum, cull_xform, cull_COP, TRUE); diff --git a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj index d896b9e1dc1..924e651820a 100644 --- a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj +++ b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj @@ -272,7 +272,6 @@ - @@ -432,7 +431,6 @@ - diff --git a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj.filters b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj.filters index eb0aa417e9e..6b914ad5546 100644 --- a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj.filters +++ b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj.filters @@ -699,9 +699,6 @@ Lights - - Core - Core @@ -1277,9 +1274,6 @@ Debug - - Core - Core diff --git a/src/Layers/xrRenderPC_R4/r4.h b/src/Layers/xrRenderPC_R4/r4.h index 700873f3dbe..9b4bd45a53e 100644 --- a/src/Layers/xrRenderPC_R4/r4.h +++ b/src/Layers/xrRenderPC_R4/r4.h @@ -176,7 +176,7 @@ class CRender : public D3DXRenderBase light_Package LP_normal; light_Package LP_pending; - xr_vector> main_coarse_structure; + xr_vector main_coarse_structure; shared_str c_sbase; shared_str c_lmaterial; diff --git a/src/Layers/xrRenderPC_R4/r4_R_sun.cpp b/src/Layers/xrRenderPC_R4/r4_R_sun.cpp index 9008b3c3584..cb13eba892f 100644 --- a/src/Layers/xrRenderPC_R4/r4_R_sun.cpp +++ b/src/Layers/xrRenderPC_R4/r4_R_sun.cpp @@ -248,7 +248,7 @@ struct DumbClipper return D3DXVECTOR3((i & 1) ? bb.vMin.x : bb.vMax.x, (i & 2) ? bb.vMin.y : bb.vMax.y, (i & 4) ? bb.vMin.z : bb.vMax.z); } - Fbox clipped_AABB(xr_vector>& src, Fmatrix& xf) + Fbox clipped_AABB(xr_vector& src, Fmatrix& xf) { Fbox3 result; result.invalidate(); @@ -292,7 +292,7 @@ struct DumbClipper } }; -xr_vector> s_casters; +xr_vector s_casters; D3DXVECTOR2 BuildTSMProjectionMatrix_caster_depth_bounds(D3DXMATRIX& lightSpaceBasis) { @@ -427,7 +427,7 @@ void CRender::render_sun() } // Fill the database - xr_vector>& s_receivers = main_coarse_structure; + xr_vector& s_receivers = main_coarse_structure; s_casters.reserve(s_receivers.size()); set_Recorder(&s_casters); r_dsgraph_render_subspace(cull_sector, &cull_frustum, cull_xform, cull_COP, TRUE); diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj index 653d41c83f3..00562b8cf1f 100644 --- a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj +++ b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj @@ -273,7 +273,6 @@ - @@ -438,7 +437,6 @@ - diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj.filters b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj.filters index 20f6b231da6..daf41f614af 100644 --- a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj.filters +++ b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj.filters @@ -720,9 +720,6 @@ Lights - - Core - Core @@ -1313,9 +1310,6 @@ Debug - - Core - Core diff --git a/src/xrCore/Memory/memory_allocator_options.h b/src/xrCore/Memory/memory_allocator_options.h index 9e47884cf1e..fb9b33223ad 100644 --- a/src/xrCore/Memory/memory_allocator_options.h +++ b/src/xrCore/Memory/memory_allocator_options.h @@ -5,5 +5,4 @@ //////////////////////////////////////////////////////////////////////////// #pragma once -#define USE_DOUG_LEA_ALLOCATOR_FOR_RENDER //#define USE_ARENA_ALLOCATOR