SL-17574 Add probe detail combo box to advanced graphics preferences. Fix spot light shadows not working in probes.

1 files changed, 11 insertions, 5 deletions

diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index f4c55bde7d..f05b7aec8e 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -218,8 +218,9 @@ public:
 	U32         addObject(LLViewerObject *obj);
 
 	void		enableShadows(const bool enable_shadows);
-    void        releaseShadowTargets();
-    void        releaseShadowTarget(U32 index);
+    void        releaseSpotShadowTargets();
+    void        releaseSunShadowTargets();
+    void        releaseSunShadowTarget(U32 index);
 
 // 	void		setLocalLighting(const bool local_lighting);
 // 	bool		isLocalLightingEnabled() const;
@@ -304,7 +305,8 @@ public:
 
 	void generateWaterReflection(LLCamera& camera);
 	void generateSunShadow(LLCamera& camera);
-    LLRenderTarget* getShadowTarget(U32 i);
+    LLRenderTarget* getSunShadowTarget(U32 i);
+    LLRenderTarget* getSpotShadowTarget(U32 i);
 
 	void generateHighlight(LLCamera& camera);
 	void renderHighlight(const LLViewerObject* obj, F32 fade);
@@ -660,12 +662,15 @@ public:
         LLRenderTarget			deferredLight;
 
         //sun shadow map
-        LLRenderTarget			shadow[6];
-        LLRenderTarget			shadowOcclusion[6];
+        LLRenderTarget			shadow[4];
+        LLRenderTarget			shadowOcclusion[4];
     };
 
     RenderTargetPack* mRT;
 
+    LLRenderTarget          mSpotShadow[2];
+    LLRenderTarget          mSpotShadowOcclusion[2];
+
     LLRenderTarget			mHighlight;
     LLRenderTarget			mPhysicsDisplay;
 
@@ -688,6 +693,7 @@ public:
 	LLVector3				mShadowFrustOrigin[4];
 	LLCamera				mShadowCamera[8];
 	LLVector3				mShadowExtents[4][2];
+    // TODO : separate Sun Shadow and Spot Shadow matrices
 	glh::matrix4f			mSunShadowMatrix[6];
 	glh::matrix4f			mShadowModelview[6];
 	glh::matrix4f			mShadowProjection[6];