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

983 add debug setting to control the maximum download resolution (#986) 

* Create RenderMaxTextureResolution.md

* #983 Add RenderMaxTextureResolution setting.  Incidental crash fix.
master
RunitaiLinden 2024-03-13 12:22:12 -05:00 committed by GitHub
parent 329996de50
commit ef75523555
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/testplans/RenderMaxTextureResolution.md Normal file
View File

@ -0,0 +1,16 @@
The Setting RenderMaxTextureResolution controls the maximum resolution of non-boosted textures as displayed by the viewer.
Valid values are 512-2048 (clamped in C++).
![image](https://github.com/secondlife/viewer/assets/23218274/d0f889fc-8135-41d2-9d83-871ad4eebed5)
![image](https://github.com/secondlife/viewer/assets/23218274/19950828-7eb1-4bb2-85d7-f35c63b34294)
![image](https://github.com/secondlife/viewer/assets/23218274/249afc83-4de6-488d-a05e-4877d08573b1)
Test Asset available on beta grid:
Object: 'Damaged Helmet', AssetID 0623e759-11b5-746c-a75e-7ba1caa6eb0e

11
indra/newview/app_settings/settings.xml
View File

@ -9405,6 +9405,17 @@
<string>U32</string> <string>U32</string>
<key>Value</key> <key>Value</key>
<integer>16</integer> <integer>16</integer>
</map>
<key>RenderMaxTextureResolution</key>
<map>
<key>Comment</key>
<string>Maximum texture resolution to download for non-boosted textures.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>2048</integer>
</map> </map>
<key>RenderDebugTextureBind</key> <key>RenderDebugTextureBind</key>
<map> <map>

2
indra/newview/llheroprobemanager.cpp
View File

@ -581,7 +581,7 @@ bool LLHeroProbeManager::registerViewerObject(LLVOVolume* drawablep)
void LLHeroProbeManager::unregisterViewerObject(LLVOVolume* drawablep) void LLHeroProbeManager::unregisterViewerObject(LLVOVolume* drawablep)
{ {
std::vector<LLVOVolume*>::iterator found_itr = std::find(mHeroVOList.begin(), mHeroVOList.end(), drawablep); std::vector<LLPointer<LLVOVolume>>::iterator found_itr = std::find(mHeroVOList.begin(), mHeroVOList.end(), drawablep);
if (found_itr != mHeroVOList.end()) if (found_itr != mHeroVOList.end())
{ {
mHeroVOList.erase(found_itr); mHeroVOList.erase(found_itr);

4
indra/newview/llheroprobemanager.h
View File

@ -146,8 +146,8 @@ private:
U32 mCurrentProbeUpdateFrame = 0; U32 mCurrentProbeUpdateFrame = 0;
std::vector<LLVOVolume*> mHeroVOList; std::vector<LLPointer<LLVOVolume>> mHeroVOList;
LLVOVolume* mNearestHero; LLPointer<LLVOVolume> mNearestHero;
}; };

10
indra/newview/llviewertexture.cpp
View File

@ -3079,7 +3079,15 @@ void LLViewerLODTexture::processTextureStats()
updateVirtualSize(); updateVirtualSize();
static LLCachedControl<bool> textures_fullres(gSavedSettings,"TextureLoadFullRes", false); static LLCachedControl<bool> textures_fullres(gSavedSettings,"TextureLoadFullRes", false);
{ // restrict texture resolution to download based on RenderMaxTextureResolution
static LLCachedControl<U32> max_texture_resolution(gSavedSettings, "RenderMaxTextureResolution", 2048);
// sanity clamp debug setting to avoid settings hack shenanigans
F32 tex_res = (F32)llclamp((S32)max_texture_resolution, 512, 2048);
tex_res *= tex_res;
mMaxVirtualSize = llmin(mMaxVirtualSize, tex_res);
}
if (textures_fullres) if (textures_fullres)
{ {
mDesiredDiscardLevel = 0; mDesiredDiscardLevel = 0;