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

More post-merge fixes after DRTVWR-559 & DRTVWR-539 merge

master
Brad Linden 2023-04-27 12:25:50 -07:00
parent 513ac361b1
commit dc813181a5
5 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8839,17 +8839,6 @@
<key>Value</key>
<real>0.1</real>
</map>
<key>RenderClass0MemoryBandwidth</key>
<map>
<key>Comment</key>
<string>Memory bandwidth at which to default to Class 0 in gigabytes per second. Used as basis for other classes.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>16.0</real>
</map>
<key>RenderCPUBasis</key>
<map>
<key>Comment</key>

1
indra/newview/featuretable_linux.txt
View File

@ -59,7 +59,6 @@ WindLightUseAtmosShaders 1 1
WLSkyDetail 1 128
Disregard128DefaultDrawDistance 1 1
Disregard96DefaultDrawDistance 1 1
RenderTextureMemoryMultiple 1 1.0
RenderCompressTextures 1 1
RenderShaderLightingMaxLevel 1 3
RenderDeferred 1 1

23
indra/newview/lldrawpoolmaterials.cpp
View File

@ -156,17 +156,6 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass)
F32 lastFullbright = 0.f;
F32 lastMinimumAlpha = 0.f;
LLVector4 lastSpecular = LLVector4(0, 0, 0, 0);
#if 0 // TODO merge brad move this down into LLCullResult begin/end loop
if(params.mFace)
{
LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
if( vobj && vobj->isAttachment() )
{
trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
}
}
#endif
GLint intensity = mShader->getUniformLocation(LLShaderMgr::ENVIRONMENT_INTENSITY);
GLint brightness = mShader->getUniformLocation(LLShaderMgr::EMISSIVE_BRIGHTNESS);
@ -212,6 +201,18 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass)
LLCullResult::increment_iterator(i, end);
#if 0 // TODO SL-19656 figure out how to reenable trackAttachments()
if(params.mFace)
{
LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject();
if( vobj && vobj->isAttachment() )
{
trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr );
}
}
#endif
if (specular > -1 && params.mSpecColor != lastSpecular)
{
lastSpecular = params.mSpecColor;

1
indra/newview/llfeaturemanager.cpp
View File

@ -408,7 +408,6 @@ bool LLFeatureManager::loadGPUClass()
{
if (!gSavedSettings.getBOOL("SkipBenchmark"))
{
//F32 class0_gbps = gSavedSettings.getF32("RenderClass0MemoryBandwidth"); // TODO merge brad - figure out what to do with this setting and the below gbps constant comparisons
//get memory bandwidth from benchmark
F32 gbps;
try

12
indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
View File

@ -439,21 +439,11 @@ void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
shadow_text->setEnabled(enabled);
// Hardware settings
# if 0 // TODO merge brad VRAM is rewritten
F32 mem_multiplier = gSavedSettings.getF32("RenderTextureMemoryMultiple");
S32Megabytes min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
S32Megabytes max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting(false, mem_multiplier);
getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMinValue(min_tex_mem.value());
getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMaxValue(max_tex_mem.value());
#endif
#if 0 // cannot turn off VBOs anymore
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
!gGLManager.mHasVertexBufferObject)
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable"))
{
getChildView("vbo")->setEnabled(FALSE);
}
#endif
if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderCompressTextures"))
{