diff options
Diffstat (limited to 'indra/newview/app_settings')
3 files changed, 2 insertions, 25 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 88365e6651..3f9a91e38f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3387,29 +3387,6 @@ <key>Value</key> <integer>0</integer> </map> - <!-- TODO: Remove settings keys DisablePrimaryGraphicsMemoryAccounting and DisableSecondaryGraphicsMemoryAccounting after testing, and code that references them --> - <key>DisablePrimaryGraphicsMemoryAccounting</key> - <map> - <key>Comment</key> - <string>Disable the first method used to detect GPU memory use</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> - <key>DisableSecondaryGraphicsMemoryAccounting</key> - <map> - <key>Comment</key> - <string>Disable the second method used to detect GPU memory use, used as a fallback when the first method fails</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>DisableTextHyperlinkActions</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/shaders/class1/interface/radianceGenF.glsl b/indra/newview/app_settings/shaders/class1/interface/radianceGenF.glsl index 32f157e9d2..839e10ce5e 100644 --- a/indra/newview/app_settings/shaders/class1/interface/radianceGenF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/radianceGenF.glsl @@ -124,7 +124,7 @@ vec4 prefilterEnvMap(vec3 R) vec3 V = R; vec4 color = vec4(0.0); float totalWeight = 0.0; - float envMapDim = 256.0; + float envMapDim = 128.0; int numSamples = 4; float numMips = 6.0; diff --git a/indra/newview/app_settings/shaders/class1/interface/reflectionmipF.glsl b/indra/newview/app_settings/shaders/class1/interface/reflectionmipF.glsl index 9dd97a80b2..f0d579f85e 100644 --- a/indra/newview/app_settings/shaders/class1/interface/reflectionmipF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/reflectionmipF.glsl @@ -90,7 +90,7 @@ void main() // convert linear depth to distance vec3 v; - v.xy = depth_tc / 512.0 * 2.0 - 1.0; + v.xy = depth_tc / 256.0 * 2.0 - 1.0; v.z = 1.0; v = normalize(v); dist /= v.z; |