Second Life viewer sources 1.23.0-RC

1 files changed, 15 insertions, 3 deletions

diff --git a/linden/indra/newview/lldrawpoolterrain.h b/linden/indra/newview/lldrawpoolterrain.h
index b1185a5..19d09e2 100644
--- a/linden/indra/newview/lldrawpoolterrain.h
+++ b/linden/indra/newview/lldrawpoolterrain.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -42,12 +43,14 @@ public:
         {
                 VERTEX_DATA_MASK =      LLVertexBuffer::MAP_VERTEX |
                                                         LLVertexBuffer::MAP_NORMAL |
-                                                        LLVertexBuffer::MAP_TEXCOORD |
+                                                        LLVertexBuffer::MAP_TEXCOORD0 |
+                                                        LLVertexBuffer::MAP_TEXCOORD1 |
                                                         LLVertexBuffer::MAP_TEXCOORD2 |
+                                                        LLVertexBuffer::MAP_TEXCOORD3 |
                                                         LLVertexBuffer::MAP_COLOR
         };
 
-        virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; }
+        virtual U32 getVertexDataMask();
         static S32 getDetailMode();
 
         LLDrawPoolTerrain(LLViewerImage *texturep);
@@ -55,6 +58,15 @@ public:
 
         /*virtual*/ LLDrawPool *instancePool();
 
+        /*virtual*/ S32 getNumDeferredPasses() { return 1; }
+        /*virtual*/ void beginDeferredPass(S32 pass);
+        /*virtual*/ void endDeferredPass(S32 pass);
+        /*virtual*/ void renderDeferred(S32 pass);
+
+        /*virtual*/ S32 getNumShadowPasses() { return 1; }
+        /*virtual*/ void beginShadowPass(S32 pass);
+        /*virtual*/ void endShadowPass(S32 pass);
+        /*virtual*/ void renderShadow(S32 pass);
 
         /*virtual*/ void render(S32 pass = 0);
         /*virtual*/ void prerender();