Don't clamp physical system memory clamped to 4GB

Tue, 10 May 2016 10:36:37 +0200

author
Ansariel
date
Tue, 10 May 2016 10:36:37 +0200
changeset 48981
65ec03effdaf
parent 48980
8040d819e5e7
child 48982
d551525e7b36

Don't clamp physical system memory clamped to 4GB

indra/newview/llviewertexturelist.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llviewertexturelist.cpp	Thu Apr 28 11:32:39 2016 +0200
     1.2 +++ b/indra/newview/llviewertexturelist.cpp	Tue May 10 10:36:37 2016 +0200
     1.3 @@ -1392,7 +1392,10 @@
     1.4  		LL_WARNS() << "VRAM amount not detected, defaulting to " << max_texmem << " MB" << LL_ENDL;
     1.5  	}
     1.6  
     1.7 -	S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped(); // In MB
     1.8 +	// <FS:Ansariel> Texture memory management
     1.9 +	//S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped(); // In MB
    1.10 +	S32Megabytes system_ram = gSysMemory.getPhysicalMemoryKB(); // In MB
    1.11 +	// </FS:Ansariel>
    1.12  	//LL_INFOS() << "*** DETECTED " << system_ram << " MB of system memory." << LL_ENDL;
    1.13  	if (get_recommended)
    1.14  		max_texmem = llmin(max_texmem, system_ram/2);
    1.15 @@ -1498,7 +1501,10 @@
    1.16  // </FS:Ansariel>
    1.17  
    1.18  	//system mem
    1.19 -	S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped();
    1.20 +	// <FS:Ansariel> Texture memory management
    1.21 +	//S32Megabytes system_ram = gSysMemory.getPhysicalMemoryClamped();
    1.22 +	S32Megabytes system_ram = gSysMemory.getPhysicalMemoryKB();
    1.23 +	// </FS:Ansariel>
    1.24  
    1.25  	//minimum memory reserved for non-texture use.
    1.26  	//if system_raw >= 1GB, reserve at least 512MB for non-texture use;

mercurial