From afa2999f067097cf833bce1517a3e75ccd20a32a Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 29 Nov 2010 11:54:34 -0600 Subject: Tweak DoF bloom gradient. --- .../app_settings/shaders/class1/deferred/postDeferredF.glsl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl index eec44d9d42..4503dc9003 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredF.glsl @@ -75,11 +75,11 @@ void main() float w = 1.0; float fd = far_focal_distance; - float sc = clamp(depth[0]/fd, 0.0, -8.0/fd); - sc = min(sc, 8.0); + float sc = far_focal_distance - depth[0]; + sc /= near_focal_distance-far_focal_distance; - //fd = depth[0]*0.5; - + sc = min(sc, 8.0); + while (sc > 1.0) { do_aa = false; -- cgit v1.2.3 From 689555fda2d580808ef4b9012b14716b4d1193e5 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 29 Nov 2010 11:54:58 -0600 Subject: Get rid of some redudnant calls to constructUrl --- indra/newview/llmeshrepository.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 1ff11f2c01..d8aeb1bf81 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -828,7 +828,7 @@ bool LLMeshRepoThread::fetchMeshDecomposition(const LLUUID& mesh_id) { ++sActiveLODRequests; LLMeshRepository::sHTTPRequestCount++; - mCurlRequest->getByteRange(constructUrl(mesh_id), headers, offset, size, + mCurlRequest->getByteRange(http_url, headers, offset, size, new LLMeshDecompositionResponder(mesh_id, offset, size)); } } @@ -900,7 +900,7 @@ bool LLMeshRepoThread::fetchMeshPhysicsShape(const LLUUID& mesh_id) { ++sActiveLODRequests; LLMeshRepository::sHTTPRequestCount++; - mCurlRequest->getByteRange(constructUrl(mesh_id), headers, offset, size, + mCurlRequest->getByteRange(http_url, headers, offset, size, new LLMeshPhysicsShapeResponder(mesh_id, offset, size)); } } -- cgit v1.2.3