livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to system info details

meow-7.2.2
Ansariel 2020-10-25 12:56:31 +01:00
parent f9d8467d1e
commit 8d1b6e0f3f
10 changed files with 82 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/fsdata.cpp
View File

@ -1058,9 +1058,16 @@ LLSD FSData::getSystemInfo()
sysinfo2 += llformat("Draw Distance: %d m\n", info["DRAW_DISTANCE"].asInteger());
sysinfo2 += llformat("Bandwidth: %d kbit/s\n", info["BANDWIDTH"].asInteger());
sysinfo2 += llformat("LOD Factor: %.3f\n", info["LOD"].asReal());
sysinfo2 += llformat("Render quality: %s\n", info["RENDERQUALITY_FSDATA_ENGLISH"].asString().c_str()); // <FS:PP> FIRE-4785: Current render quality setting in sysinfo / about floater
sysinfo2 += llformat("Render quality: %s\n", info["RENDERQUALITY_FSDATA_ENGLISH"].asString().c_str());
sysinfo2 += llformat("ALM enabled: %s\n", info["ALMSTATUS_FSDATA_ENGLISH"].asString().c_str());
sysinfo2 += llformat("Texture memory: %d MB (%.2f)\n", info["TEXTUREMEMORY"].asInteger(), info["TEXTUREMEMORYMULTIPLIER"].asReal());
if (info["TEXTUREMEMORYDYNAMIC"].asBoolean())
{
sysinfo2 += llformat("Texture memory: Dynamic (%d MB min / %d%% Cache / %d%% VRAM)\n", info["TEXTUREMEMORYMIN"].asInteger(), info["TEXTUREMEMORYCACHERESERVE"].asInteger(), info["TEXTUREMEMORYGPURESERVE"].asInteger());
}
else
{
sysinfo2 += llformat("Texture memory: %d MB (%.2f)\n", info["TEXTUREMEMORY"].asInteger(), info["TEXTUREMEMORYMULTIPLIER"].asReal());
}
sysinfo2 += "VFS (cache) creation time (UTC) " + info["VFS_DATE"].asString();
LLSD sysinfos;

19
indra/newview/llappviewer.cpp
View File

@ -3966,8 +3966,12 @@ LLSD LLAppViewer::getViewerInfo() const
// </FS:PP>
// <FS:Ansariel> FIRE-11768: Include texture memory settings
info["TEXTUREMEMORYDYNAMIC"] = LLViewerTextureList::canUseDynamicTextureMemory() && gSavedSettings.getBOOL("FSDynamicTextureMemory");
info["TEXTUREMEMORY"] = gSavedSettings.getS32("TextureMemory");
info["TEXTUREMEMORYMULTIPLIER"] = gSavedSettings.getF32("RenderTextureMemoryMultiple");
info["TEXTUREMEMORYMIN"] = gSavedSettings.getS32("FSDynamicTextureMemoryMinTextureMemory");
info["TEXTUREMEMORYCACHERESERVE"] = gSavedSettings.getS32("FSDynamicTextureMemoryCacheReserve");
info["TEXTUREMEMORYGPURESERVE"] = gSavedSettings.getS32("FSDynamicTextureMemoryGPUReserve");
// </FS:Ansariel>
// <FS:ND> Add creation time of VFS (cache)
@ -4048,6 +4052,21 @@ std::string LLAppViewer::getViewerInfoString(bool default_string) const
{
support << "\n" << LLTrans::getString("AboutSettings", args, default_string);
}
if (info.has("TEXTUREMEMORYDYNAMIC"))
{
if (info["TEXTUREMEMORYDYNAMIC"].asBoolean())
{
support << "\n" << LLTrans::getString("AboutTextureMemoryDynamic", args, default_string);
}
else
{
support << "\n" << LLTrans::getString("AboutTextureMemory", args, default_string);
}
}
if (info.has("VFS_DATE"))
{
support << "\n" << LLTrans::getString("AboutVFS", args, default_string);
}
// </FS>
if (info.has("COMPILER"))
{

4
indra/newview/llfloaterpreference.cpp
View File

@ -2312,8 +2312,7 @@ void LLFloaterPreference::refreshEnabledState()
// <FS:Ansariel> Dynamic texture memory calculation
void LLFloaterPreference::handleDynamicTextureMemoryChanged()
{
#if ADDRESS_SIZE == 64
if ((gGLManager.mHasATIMemInfo || gGLManager.mHasNVXMemInfo) && gGLManager.mVRAM >= 512)
if (LLViewerTextureList::canUseDynamicTextureMemory())
{
bool dynamic_tex_mem_enabled = gSavedSettings.getBOOL("FSDynamicTextureMemory");
childSetEnabled("FSDynamicTextureMemory", true);
@ -2323,7 +2322,6 @@ void LLFloaterPreference::handleDynamicTextureMemoryChanged()
childSetEnabled("GraphicsCardTextureMemory", !dynamic_tex_mem_enabled);
}
else
#endif
{
childSetEnabled("FSDynamicTextureMemory", false);
childSetEnabled("FSDynamicTextureMemoryMinTextureMemory", false);

29
indra/newview/llviewertexturelist.cpp
View File

@ -1524,27 +1524,29 @@ void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem)
}
// <FS:Ansariel> Dynamic texture memory calculation
//static
bool LLViewerTextureList::canUseDynamicTextureMemory()
{
#if ADDRESS_SIZE == 64
return (gGLManager.mHasATIMemInfo || gGLManager.mHasNVXMemInfo) && gGLManager.mVRAM >= 512;
#else
return false;
#endif
}
void LLViewerTextureList::updateTexMemDynamic()
{
#if ADDRESS_SIZE == 64 // Only available on 64bit versions
if (!canUseDynamicTextureMemory())
{
return;
}
static LLCachedControl<bool> fsDynamicTexMem(gSavedSettings, "FSDynamicTextureMemory");
if (!fsDynamicTexMem)
{
return;
}
if (!gGLManager.mHasATIMemInfo && !gGLManager.mHasNVXMemInfo)
{
// Can't detect current GPU mem usage - so, nope!
return;
}
if (gGLManager.mVRAM < 512)
{
// Only for GPUs with at least 512MB video memory
return;
}
static LLCachedControl<S32> fsDynamicTexMemCacheReserve(gSavedSettings, "FSDynamicTextureMemoryCacheReserve");
static LLCachedControl<S32> fsDynamicTexMemGPUReserve(gSavedSettings, "FSDynamicTextureMemoryGPUReserve");
static LLCachedControl<S32> fsDynamicTexMemMinTextureMemory(gSavedSettings, "FSDynamicTextureMemoryMinTextureMemory");
@ -1574,7 +1576,6 @@ void LLViewerTextureList::updateTexMemDynamic()
// get evicted from GPU memory, if available memory gets low (see LLViewerFetchedTexture::destroyTexture()).
mMaxTotalTextureMemInMegaBytes = llmax(max_tex_mem_in_gpu, min_texture_mem) - gpu_reserve;
mMaxResidentTexMemInMegaBytes = mMaxTotalTextureMemInMegaBytes - cache_reserve;
#endif
}
// </FS:Ansariel>

5
indra/newview/llviewertexturelist.h
View File

@ -129,7 +129,10 @@ public:
S32 getNumImages() { return mImageList.size(); }
void updateMaxResidentTexMem(S32Megabytes mem);
void updateTexMemDynamic(); // <FS:Ansariel> Dynamic texture memory calculation
// <FS:Ansariel> Dynamic texture memory calculation
void updateTexMemDynamic();
static bool canUseDynamicTextureMemory();
// </FS:Ansariel>
void doPreloadImages();
void doPrefetchImages();

11
indra/newview/skins/default/xui/de/strings.xml
View File

@ -78,8 +78,15 @@ Bandbreite: [BANDWIDTH] kbit/s
LOD-Faktor: [LOD]
Darstellungsqualität: [RENDERQUALITY]
Erweitertes Beleuchtungsmodell: [ALMSTATUS]
Texturspeicher: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
VFS (Cache) Erstellungszeit: [VFS_DATE]
</string>
<string name="AboutTextureMemory">
Texturspeicher: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutTextureMemoryDynamic">
Texturspeicher: Dynamisch ([TEXTUREMEMORYMIN] MB min. / [TEXTUREMEMORYCACHERESERVE]% Cache / [TEXTUREMEMORYGPURESERVE]% VRAM)
</string>
<string name="AboutVFS">
VFS (Cache) Erstellungszeit: [VFS_DATE]
</string>
<string name="AboutOSXHiDPI">
HiDPI-Anzeigemodus: [HIDPI]

7
indra/newview/skins/default/xui/en/strings.xml
View File

@ -70,7 +70,14 @@ Bandwidth: [BANDWIDTH] kbit/s
LOD factor: [LOD]
Render quality: [RENDERQUALITY]
Advanced Lighting Model: [ALMSTATUS]
</string>
<string name="AboutTextureMemory">
Texture memory: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutTextureMemoryDynamic">
Texture memory: Dynamic ([TEXTUREMEMORYMIN] MB min / [TEXTUREMEMORYCACHERESERVE]% Cache / [TEXTUREMEMORYGPURESERVE]% VRAM)
</string>
<string name="AboutVFS">
VFS (cache) creation time (UTC): [VFS_DATE]
</string>
<string name="AboutOSXHiDPI">

8
indra/newview/skins/default/xui/it/strings.xml
View File

@ -67,8 +67,12 @@ Banda (Bandwidth): [BANDWIDTH] kbit/s
Fattore LOD (LOD factor): [LOD]
Qualità resa (Render quality): [RENDERQUALITY]
Stato illuminazione (Advanced Lighting Model): [ALMSTATUS]
Memoria texture (Texture memory): [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
VFS (cache) creation time (UTC): [VFS_DATE]
</string>
<string name="AboutTextureMemory">
Memoria texture (Texture memory): [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutVFS">
VFS (cache) creation time (UTC): [VFS_DATE]
</string>
<string name="AboutOSXHiDPI">
Modalità display HiDPI: [HIDPI]

8
indra/newview/skins/default/xui/pl/strings.xml
View File

@ -67,8 +67,12 @@ Przepustowość (Bandwidth): [BANDWIDTH] kbit/s
Mnożnik poziomu detali (LOD Factor): [LOD]
Jakość wyświetlania (Render quality): [RENDERQUALITY]
Zaawansowane oświetlenie (Advanced Lighting Model): [ALMSTATUS]
Pamięć tekstur (Texture memory): [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
Czas utworzenia VFS (cache) w UTC: [VFS_DATE]
</string>
<string name="AboutTextureMemory">
Pamięć tekstur (Texture memory): [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutVFS">
Czas utworzenia VFS (cache) w UTC: [VFS_DATE]
</string>
<string name="AboutOSXHiDPI">
Tryb obrazu HiDPI: [HIDPI]

8
indra/newview/skins/default/xui/ru/strings.xml
View File

@ -87,8 +87,12 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
Уровень детализации: [LOD]
Качество графики: [RENDERQUALITY]
Модель улучшенного освещения: [ALMSTATUS]
Графическая память: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
Время создания VFS (кэш) (UTC): [VFS_DATE]
</string>
<string name="AboutTextureMemory">
Графическая память: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutVFS">
Время создания VFS (кэш) (UTC): [VFS_DATE]
</string>
<string name="AboutOSXHiDPI">
Режим отображения HiDPI: [HIDPI]