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

Include all VRAM settings in system information

master
Ansariel 2024-06-18 11:13:52 +02:00
parent 8030bba730
commit 64cb25cb5f
10 changed files with 19 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/fsdata.cpp
View File

@ -1021,7 +1021,7 @@ LLSD FSData::getSystemInfo()
info["SIMD"].asString().c_str(),
info["BUILD_TYPE"].asString().c_str());
sysinfo1 += llformat("Build with %s version %s\n\n", info["COMPILER"].asString().c_str(), info["COMPILER_VERSION"].asString().c_str());
sysinfo1 += llformat("I am in %s located at %s (%s)\n", info["REGION"].asString().c_str(), info["HOSTNAME"].asString().c_str(), info["HOSTIP"].asString().c_str());
sysinfo1 += llformat("Location: %s (%s)\n", info["REGION"].asString().c_str(), info["HOSTNAME"].asString().c_str(), info["HOSTIP"].asString().c_str());
sysinfo1 += llformat("%s\n\n", info["SERVER_VERSION"].asString().c_str());
sysinfo1 += llformat("CPU: %s\n", info["CPU"].asString().c_str());
@ -1029,7 +1029,9 @@ LLSD FSData::getSystemInfo()
sysinfo1 += llformat("OS: %s\n", info["OS_VERSION"].asString().c_str());
sysinfo1 += llformat("Graphics Card Vendor: %s\n", info["GRAPHICS_CARD_VENDOR"].asString().c_str());
sysinfo1 += llformat("Graphics Card: %s\n", info["GRAPHICS_CARD"].asString().c_str());
sysinfo1 += llformat("Graphics Card Memory: %d MB\n", info["GRAPHICS_CARD_MEMORY"].asInteger());
sysinfo1 += llformat("VRAM: %d MB\n", info["GRAPHICS_CARD_MEMORY"].asInteger());
sysinfo1 += llformat("VRAM (Detected): %d MB\n", info["GRAPHICS_CARD_MEMORY_DETECTED"].asInteger());
sysinfo1 += llformat("VRAM (Budget): %s\n", info["VRAM_BUDGET_ENGLISH"].asString().c_str());
if (info.has("GRAPHICS_DRIVER_VERSION"))
{
@ -1062,15 +1064,6 @@ LLSD FSData::getSystemInfo()
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());
sysinfo2 += llformat("ALM enabled: %s\n", info["ALMSTATUS_FSDATA_ENGLISH"].asString().c_str());
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 += "Disk cache: " + info["DISK_CACHE_INFO"].asString();
LLSD sysinfos;

15
indra/newview/llappviewer.cpp
View File

@ -3958,6 +3958,7 @@ LLSD LLAppViewer::getViewerInfo() const
info["GRAPHICS_CARD"] = ll_safe_string((const char*)(glGetString(GL_RENDERER)));
info["GRAPHICS_CARD_MEMORY"] = gGLManager.mVRAM;
info["GRAPHICS_CARD_MEMORY_DETECTED"] = gGLManager.mVRAMDetected; // <FS:Beq/> allow detected hardware to be overridden.
#if LL_WINDOWS
std::string drvinfo;
@ -4158,18 +4159,18 @@ LLSD LLAppViewer::getViewerInfo() const
}
// </FS:PP>
// <FS:PP> ALM enabled or disabled
if (gSavedSettings.getBOOL("RenderDeferred"))
// <FS:Ansariel> Include VRAM budget
if (auto budget = gSavedSettings.getU32("RenderMaxVRAMBudget"); budget > 0)
{
info["ALMSTATUS"] = LLTrans::getString("PermYes");
info["ALMSTATUS_FSDATA_ENGLISH"] = "Yes";
info["VRAM_BUDGET"] = std::to_string(budget) + " MB";
info["VRAM_BUDGET_ENGLISH"] = std::to_string(budget) + " MB";
}
else
{
info["ALMSTATUS"] = LLTrans::getString("PermNo");
info["ALMSTATUS_FSDATA_ENGLISH"] = "No";
info["VRAM_BUDGET"] = LLTrans::getString("Unlimited");
info["VRAM_BUDGET_ENGLISH"] = "Unlimited";
}
// </FS:PP>
// </FS:Ansariel>
return info;
}

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

@ -76,13 +76,6 @@ UI məstabı: [UI_SCALE_FACTOR]
Bandwidth: [BANDWIDTH]
Detallaşdırma səviyyəsi: [LOD]
Grafika keyfiyyəti: [RENDERQUALITY]
Yüksəldilmiş işıqlandırma modeli: [ALMSTATUS]
</string>
<string name="AboutTextureMemory">
Tekstur yaddaşı: [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutTextureMemoryDynamic">
Tekstur yaddaşı: dinamik ([TEXTUREMEMORYMIN] MB min. / [TEXTUREMEMORYCACHERESERVE]% Cache / [TEXTUREMEMORYGPURESERVE]% VRAM)
</string>
<string name="AboutCache">
Disk keşi: [DISK_CACHE_INFO]

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

@ -58,7 +58,8 @@ Betriebssystemversion: [OS_VERSION]
Grafikkartenhersteller: [GRAPHICS_CARD_VENDOR]
Grafikkarte: [GRAPHICS_CARD]
Grafikkartenspeicher: [GRAPHICS_CARD_MEMORY] MB
Grafikkartenspeicher (erkannt): [GRAPHICS_CARD_MEMORY_DETECTED] MB
Grafikkartenspeicher (Erkannt): [GRAPHICS_CARD_MEMORY_DETECTED] MB
Grafikkartenspeicher (Budget): [VRAM_BUDGET]
</string>
<string name="AboutDriver">
Windows-Grafiktreiberversion: [GRAPHICS_DRIVER_VERSION]
@ -77,7 +78,6 @@ Draw Distance: [DRAW_DISTANCE] m
Bandbreite: [BANDWIDTH] kbit/s
LOD-Faktor: [LOD]
Darstellungsqualität: [RENDERQUALITY]
Erweitertes Beleuchtungsmodell: [ALMSTATUS]
</string>
<string name="AboutCache">
Disk-Cache: [DISK_CACHE_INFO]
@ -7274,4 +7274,7 @@ Ihre aktuelle Position: [AVATAR_POS]
<string name="OpenSimInventoryValidationErrorGenericHelp">
das Support-Team Ihres Grid-Betreibers
</string>
<string name="Unlimited">
Unlimitiert
</string>
</strings>

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

@ -57,6 +57,7 @@ Graphics Card Vendor: [GRAPHICS_CARD_VENDOR]
Graphics Card: [GRAPHICS_CARD]
Graphics Card Memory: [GRAPHICS_CARD_MEMORY] MB
Graphics Card Memory (Detected): [GRAPHICS_CARD_MEMORY_DETECTED] MB
Graphics Card Memory (Budget): [VRAM_BUDGET]
</string>
<string name="AboutDriver">Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION]</string>
<string name="AboutOGL">OpenGL Version: [OPENGL_VERSION]</string>
@ -71,7 +72,6 @@ Draw distance: [DRAW_DISTANCE] m
Bandwidth: [BANDWIDTH] kbit/s
LOD factor: [LOD]
Render quality: [RENDERQUALITY]
Advanced Lighting Model: [ALMSTATUS]
</string>
<string name="AboutCache">
Disk cache: [DISK_CACHE_INFO]
@ -3300,4 +3300,5 @@ Your current position: [AVATAR_POS]
<string name="FSObjectInventoryOneElement">1 Element</string>
<string name="FSObjectInventoryElements">[NUM_ELEMENTS] Elements</string>
<string name="OpenSimInventoryValidationErrorGenericHelp">your Grid Operator's support team</string>
<string name="Unlimited">Unlimited</string>
</strings>

2
indra/newview/skins/default/xui/es/floater_about.xml
View File

@ -35,8 +35,6 @@ Distancia de dibujo (Draw distance): [DRAW_DISTANCE]
Ancho de banda (Bandwidth): [BANDWIDTH]
Factor de nivel de detalle (LOD factor): [LOD]
Calidad de dibujo (Render quality): [RENDERQUALITY]
Advanced Lighting Model: [ALMSTATUS]
Memoria de texturas (Texture memory): [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</floater.string>
<floater.string name="none">
(ninguno)

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

@ -73,13 +73,6 @@ Distance d'affichage : [DRAW_DISTANCE] m
Bande passante : [BANDWIDTH] kbit/s
Facteur LOD : [LOD]
Qualité du rendu : [RENDERQUALITY]
Modèle d'éclairage avancé : [ALMSTATUS]
</string>
<string name="AboutTextureMemory">
Mémoire des textures : [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutTextureMemoryDynamic">
Mémoire des textures : Dynamique ([TEXTUREMEMORYMIN] Mo min / [TEXTUREMEMORYCACHERESERVE]% Cache / [TEXTUREMEMORYGPURESERVE]% VRAM)
</string>
<string name="AboutCache">
Cache disque : [DISK_CACHE_INFO]

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

@ -65,10 +65,6 @@ Distanza disegno (Draw distance): [DRAW_DISTANCE] m
Banda (Bandwidth): [BANDWIDTH] kbit/s
Fattore LOD (LOD factor): [LOD]
Qualità resa (Render quality): [RENDERQUALITY]
Stato illuminazione (Advanced Lighting Model): [ALMSTATUS]
</string>
<string name="AboutTextureMemory">
Memoria texture (Texture memory): [TEXTUREMEMORY] MB ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutOSXHiDPI">
Modalità display HiDPI: [HIDPI]

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

@ -65,7 +65,6 @@ Pole widzenia (Draw Distance): [DRAW_DISTANCE] m
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]
</string>
<string name="AboutCache">
Pamięć podręczna dysku (disk cache): [DISK_CACHE_INFO]

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

@ -85,13 +85,6 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
Пропускная способность: [BANDWIDTH]
Уровень детализации: [LOD]
Качество графики: [RENDERQUALITY]
Модель улучшенного освещения: [ALMSTATUS]
</string>
<string name="AboutTextureMemory">
Память текстур: [TEXTUREMEMORY] МБ ([TEXTUREMEMORYMULTIPLIER])
</string>
<string name="AboutTextureMemoryDynamic">
Память текстур: динамическая ([TEXTUREMEMORYMIN] МБ мин. / [TEXTUREMEMORYCACHERESERVE]% Кэш / [TEXTUREMEMORYGPURESERVE]% VRAM)
</string>
<string name="AboutCache">
Кэш диска: [DISK_CACHE_INFO]