From 3cf8a1ce6e81c30cf7231a5ab045bbc45c6757e2 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 20 Feb 2015 12:56:45 -0500 Subject: Clean up impostors and visual muting Rename the settings that control them to be more descriptive Remove the separate boolean setting (RenderUseImpostors) that governed both Establish default values based on gpu class for impostors and visual muting --- indra/newview/featuretable_solaris.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/featuretable_solaris.txt') diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt index e7cae1abdc..f6f0a9cb17 100755 --- a/indra/newview/featuretable_solaris.txt +++ b/indra/newview/featuretable_solaris.txt @@ -129,7 +129,7 @@ RenderUseFBO 1 0 list low RenderVBO 1 0 RenderAniso 1 0 -RenderAvatarMaxVisible 1 3 +RenderAvatarMaxNonImpostors 1 3 RenderLighting 1 0 list medium -- cgit v1.2.3 From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/newview/featuretable_solaris.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/newview/featuretable_solaris.txt (limited to 'indra/newview/featuretable_solaris.txt') diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt old mode 100755 new mode 100644 -- cgit v1.2.3 From f495ca8f1a5046efc4eb4dba00755d3518b580e7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 29 Apr 2016 10:52:43 -0400 Subject: Adjust some avatar complexity defaults (mostly slightly upwards) Make more settings between mac and windows the same Remove solaris and xp featuretables, since we don't support them any more --- indra/newview/featuretable_solaris.txt | 193 --------------------------------- 1 file changed, 193 deletions(-) delete mode 100644 indra/newview/featuretable_solaris.txt (limited to 'indra/newview/featuretable_solaris.txt') diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt deleted file mode 100644 index f6f0a9cb17..0000000000 --- a/indra/newview/featuretable_solaris.txt +++ /dev/null @@ -1,193 +0,0 @@ -version 15 -// The version number above should be implemented IF AND ONLY IF some -// change has been made that is sufficiently important to justify -// resetting the graphics preferences of all users to the recommended -// defaults. This should be as rare an event as we can manage. - -// NOTE: This is mostly identical to featuretable.txt with a few differences -// Should be combined into one table - -// -// Generates lists of feature mask that can be applied on top of each other. -// -// // Begin comments -// list -// Starts a feature list named -// -// is the name of a feature -// is 0 or 1, whether the feature is available -// is an S32 which is the recommended value -// -// For now, the first list read sets up all of the default values -// - - -// -// All contains everything at their default settings for high end machines -// NOTE: All settings are set to the MIN of applied values, including 'all'! -// -list all -RenderVBO 1 1 -RenderAniso 1 0 -RenderAvatarMode 1 2 -RenderAvatarVP 1 1 -RenderDistance 1 128 -RenderLighting 1 1 -RenderObjectBump 1 1 -RenderParticleCount 1 4096 -RenderRippleWater 1 1 -RenderTerrainDetail 1 2 -VertexShaderEnable 1 1 -RenderTextureMemoryMultiple 1 1.0 -UseOcclusion 1 1 -RenderCubeMap 1 1 -WatchdogDisabled 1 1 -RenderUseFBO 1 1 - - -// -// Class 0 Hardware (Unknown or just old) -// -list Class0 -VertexShaderEnable 1 0 -RenderVBO 1 0 -RenderDistance 1 64 -RenderAvatarVP 1 0 -RenderAvatarMode 1 0 -RenderLighting 1 0 -RenderObjectBump 1 0 -RenderRippleWater 1 0 -RenderUseFBO 1 0 - -// -// Class 1 Hardware -// -list Class1 -VertexShaderEnable 1 0 -RenderVBO 1 1 -RenderDistance 1 96 -RenderAvatarVP 1 1 -RenderAvatarMode 1 0 -RenderLighting 1 0 -RenderObjectBump 1 0 -RenderRippleWater 1 0 -RenderUseFBO 1 0 - -// -// Class 2 Hardware (make it purty) -// -list Class2 -VertexShaderEnable 1 1 -RenderAvatarVP 1 1 -RenderAvatarMode 1 1 -RenderLighting 1 1 -RenderObjectBump 1 1 -RenderRippleWater 1 1 -RenderUseFBO 1 1 - -// -// Class 3 Hardware (make it purty) -// -list Class3 -VertexShaderEnable 1 1 -RenderAvatarVP 1 1 -RenderAvatarMode 1 1 -RenderLighting 1 1 -RenderObjectBump 1 1 -RenderRippleWater 1 1 -RenderUseFBO 1 1 - -// -// No Pixel Shaders available -// -list NoPixelShaders -VertexShaderEnable 0 0 -RenderAvatarVP 0 0 - -// -// No Vertex Shaders available -// -list NoVertexShaders -VertexShaderEnable 0 0 -RenderAvatarVP 0 0 - -// -// "Default" setups for safe, low, medium, high -// -list safe -RenderVBO 1 0 -RenderAniso 1 0 -RenderAvatarVP 0 0 -RenderLighting 1 0 -RenderParticleCount 1 1024 -RenderTerrainDetail 1 0 -RenderCubeMap 0 0 -UseOcclusion 0 0 -RenderUseFBO 1 0 - - -list low -RenderVBO 1 0 -RenderAniso 1 0 -RenderAvatarMaxNonImpostors 1 3 -RenderLighting 1 0 - -list medium -RenderLighting 1 0 - - -// -// CPU based feature masks -// - -// 1Ghz or less (equiv) -list CPUSlow -RenderParticleCount 1 1024 - - -// -// RAM based feature masks -// -list RAM256MB -RenderObjectBump 0 0 - - -// -// Graphics card based feature masks -// -list OpenGLPre15 -RenderVBO 1 0 - -list Intel -RenderVBO 1 0 -RenderAniso 1 0 -RenderLighting 1 0 -RenderTerrainDetail 1 0 -RenderCubeMap 0 0 - -list GeForce2 -RenderVBO 1 1 -RenderAniso 1 0 -RenderLighting 1 0 -RenderParticleCount 1 2048 -RenderTerrainDetail 1 0 - -list GeForce3 - -list ATI -UseOcclusion 0 0 - -list Radeon8500 -RenderLighting 1 0 -RenderParticleCount 1 4096 - -// Hacked to be paranoid "safe" -list Radeon9700 -RenderParticleCount 1 4096 - -// Hacked to be paranoid "safe" -list MobilityRadeon9000 -RenderLighting 1 0 -RenderParticleCount 1 4096 - -list GeForceFX -- cgit v1.2.3