From 68875523e09f9fe06fc4b3cd5225995bb13966c3 Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 30 Nov 2023 12:01:45 -0600
Subject: SL-20611 Incorporate water haze into new post effect atmospherics
goodness
---
indra/newview/lldrawpool.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'indra/newview/lldrawpool.h')
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h
index 5414dba6bf..4300670445 100644
--- a/indra/newview/lldrawpool.h
+++ b/indra/newview/lldrawpool.h
@@ -118,8 +118,8 @@ public:
virtual LLViewerTexture* getTexture() = 0;
virtual BOOL isFacePool() { return FALSE; }
virtual void resetDrawOrders() = 0;
+ virtual void pushFaceGeometry() {}
-protected:
S32 mShaderLevel;
S32 mId;
U32 mType; // Type of draw pool
@@ -429,6 +429,9 @@ public:
BOOL isFacePool() { return TRUE; }
+ // call drawIndexed on every draw face
+ void pushFaceGeometry();
+
friend class LLFace;
friend class LLPipeline;
public:
--
cgit v1.2.3
From 8b86e2ad1b1326cb3e98acd857dc93f4f1455b8c Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 14 Dec 2023 14:11:46 -0600
Subject: SL-20611 Followup -- fix for depth based atmospheric mask making
atmospherics effect sun/moon/clouds
---
indra/newview/lldrawpool.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra/newview/lldrawpool.h')
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h
index 4300670445..0925a01439 100644
--- a/indra/newview/lldrawpool.h
+++ b/indra/newview/lldrawpool.h
@@ -53,7 +53,9 @@ public:
// before grass, so grass should be the first alpha masked pool. Other ordering should be done
// based on fill rate and likelihood to occlude future passes (faster, large occluders first).
//
- POOL_SIMPLE = 1,
+ POOL_SKY = 1,
+ POOL_WL_SKY,
+ POOL_SIMPLE,
POOL_FULLBRIGHT,
POOL_BUMP,
POOL_TERRAIN,
@@ -64,8 +66,6 @@ public:
POOL_TREE,
POOL_ALPHA_MASK,
POOL_FULLBRIGHT_ALPHA_MASK,
- POOL_SKY,
- POOL_WL_SKY,
POOL_AVATAR,
POOL_CONTROL_AV, // Animesh
POOL_GLOW,
--
cgit v1.2.3