From b865fc88e575e39111418a329362eada368445cd Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 8 Jan 2019 17:20:56 -0800 Subject: Fix broken distortion map rendering (was culling everything). Clean up deferred\alpha shader to allow re-entrant graphics switching (link error on 2nd compile/link of deferred shaders). Clean up some uses of pragma(optimize,...). --- indra/newview/llspatialpartition.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llspatialpartition.cpp') diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 1dc1e65fe5..b24f37fc72 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -55,8 +55,6 @@ #include "llviewershadermgr.h" #include "llcontrolavatar.h" -//#pragma optimize("", off) - static LLTrace::BlockTimerStatHandle FTM_FRUSTUM_CULL("Frustum Culling"); static LLTrace::BlockTimerStatHandle FTM_CULL_REBOUND("Cull Rebound Partition"); -- cgit v1.2.3 From 5b1dd8a18cbc221e768095f77f78072ee19c1e64 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Wed, 28 Aug 2019 14:27:14 -0700 Subject: SL-11772 Modify behavior of culling while doing reflection/refraction passes. --- indra/newview/llspatialpartition.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llspatialpartition.cpp') diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index b24f37fc72..77bbcdada6 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1089,6 +1089,11 @@ public: virtual bool earlyFail(LLViewerOctreeGroup* base_group) { + if (LLPipeline::sReflectionRender) + { + return false; + } + LLSpatialGroup* group = (LLSpatialGroup*)base_group; group->checkOcclusion(); -- cgit v1.2.3