From 21ddbd64af44672e4b20dc4cdf99fd1fbc5c07c2 Mon Sep 17 00:00:00 2001 From: "Graham Linden graham@lindenlab.com" Date: Thu, 26 Apr 2018 22:35:26 +0100 Subject: Mods to make adv atmo WL sky render using 2 tris instead of dome. --- indra/newview/lldrawpool.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'indra/newview/lldrawpool.h') diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index bc299cc89f..11d8dd2e1c 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -46,22 +46,22 @@ public: enum { // Correspond to LLPipeline render type - POOL_SIMPLE = 1, + POOL_SKY = 1, + POOL_WL_SKY, + POOL_TERRAIN, POOL_GROUND, + POOL_GRASS, + POOL_VOIDWATER, + POOL_WATER, + POOL_SIMPLE, POOL_FULLBRIGHT, POOL_BUMP, - POOL_MATERIALS, - POOL_TERRAIN, - POOL_SKY, - POOL_WL_SKY, + POOL_MATERIALS, POOL_TREE, POOL_ALPHA_MASK, - POOL_FULLBRIGHT_ALPHA_MASK, - POOL_GRASS, + POOL_FULLBRIGHT_ALPHA_MASK, POOL_INVISIBLE, // see below * - POOL_AVATAR, - POOL_VOIDWATER, - POOL_WATER, + POOL_AVATAR, POOL_GLOW, POOL_ALPHA, NUM_POOL_TYPES, -- cgit v1.2.3 From 51451e0b92177ee887ba8310e304bb30e90685a9 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Thu, 30 Aug 2018 01:50:03 +0100 Subject: MAINT-9028 put back original pass order to allow depth testing to hide areas where bloom should not show through from sunlight --- indra/newview/lldrawpool.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'indra/newview/lldrawpool.h') diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index 11d8dd2e1c..bc299cc89f 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -46,22 +46,22 @@ public: enum { // Correspond to LLPipeline render type - POOL_SKY = 1, - POOL_WL_SKY, - POOL_TERRAIN, + POOL_SIMPLE = 1, POOL_GROUND, - POOL_GRASS, - POOL_VOIDWATER, - POOL_WATER, - POOL_SIMPLE, POOL_FULLBRIGHT, POOL_BUMP, - POOL_MATERIALS, + POOL_MATERIALS, + POOL_TERRAIN, + POOL_SKY, + POOL_WL_SKY, POOL_TREE, POOL_ALPHA_MASK, - POOL_FULLBRIGHT_ALPHA_MASK, + POOL_FULLBRIGHT_ALPHA_MASK, + POOL_GRASS, POOL_INVISIBLE, // see below * - POOL_AVATAR, + POOL_AVATAR, + POOL_VOIDWATER, + POOL_WATER, POOL_GLOW, POOL_ALPHA, NUM_POOL_TYPES, -- cgit v1.2.3 From 7e9033821a96a9d6e80b58fafb4c7da63807b9d4 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Thu, 6 Dec 2018 10:59:11 -0800 Subject: De-duplicate deferred gbuffer access for getPosition/getNorm. De-duplicate ambient occlusion shader code and move to new aoUtil.glsl Split shared shadow tap funcs into shadowUtil.glsl --- indra/newview/lldrawpool.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lldrawpool.h') diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index bc299cc89f..df86d78a89 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -107,7 +107,7 @@ public: virtual void prerender() = 0; virtual U32 getVertexDataMask() = 0; virtual BOOL verify() const { return TRUE; } // Verify that all data in the draw pool is correct! - virtual S32 getVertexShaderLevel() const { return mVertexShaderLevel; } + virtual S32 getShaderLevel() const { return mShaderLevel; } static LLDrawPool* createPool(const U32 type, LLViewerTexture *tex0 = NULL); virtual LLDrawPool *instancePool() = 0; // Create an empty new instance of the pool. @@ -116,7 +116,7 @@ public: virtual void resetDrawOrders() = 0; protected: - S32 mVertexShaderLevel; + S32 mShaderLevel; S32 mId; U32 mType; // Type of draw pool BOOL mSkipRender; -- cgit v1.2.3 From 1d86dcd846ed5ea7734df507d15adf057cb2ebd0 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Mon, 8 Jul 2019 10:10:22 -0700 Subject: SL-10625 another shot across the bow Move dynamic texture update (which does local back readback work) to just before swap which may keep the Intel driver from tripping on its own shoelaces and is also subjectively faster for bakes. --- indra/newview/lldrawpool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lldrawpool.h') diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h index df86d78a89..4eb9a4151d 100644 --- a/indra/newview/lldrawpool.h +++ b/indra/newview/lldrawpool.h @@ -174,7 +174,7 @@ public: virtual void pushBatch(LLDrawInfo& params, U32 mask, BOOL texture, BOOL batch_textures = FALSE); virtual void renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL texture = TRUE); virtual void renderGroups(U32 type, U32 mask, BOOL texture = TRUE); - virtual void renderTexture(U32 type, U32 mask); + virtual void renderTexture(U32 type, U32 mask, BOOL batch_textures = TRUE); }; -- cgit v1.2.3