diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/lldrawpoolsky.h | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lldrawpoolsky.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/linden/indra/newview/lldrawpoolsky.h b/linden/indra/newview/lldrawpoolsky.h index 2b22060..f35b114 100644 --- a/linden/indra/newview/lldrawpoolsky.h +++ b/linden/indra/newview/lldrawpoolsky.h | |||
@@ -17,7 +17,8 @@ | |||
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -49,7 +50,7 @@ public: | |||
49 | enum | 50 | enum |
50 | { | 51 | { |
51 | VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | | 52 | VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX | |
52 | LLVertexBuffer::MAP_TEXCOORD | 53 | LLVertexBuffer::MAP_TEXCOORD0 |
53 | }; | 54 | }; |
54 | 55 | ||
55 | virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } | 56 | virtual U32 getVertexDataMask() { return VERTEX_DATA_MASK; } |
@@ -58,6 +59,11 @@ public: | |||
58 | 59 | ||
59 | /*virtual*/ LLDrawPool *instancePool(); | 60 | /*virtual*/ LLDrawPool *instancePool(); |
60 | 61 | ||
62 | /*virtual*/ S32 getNumPostDeferredPasses() { return getNumPasses(); } | ||
63 | /*virtual*/ void beginPostDeferredPass(S32 pass) { beginRenderPass(pass); } | ||
64 | /*virtual*/ void endPostDeferredPass(S32 pass) { endRenderPass(pass); } | ||
65 | /*virtual*/ void renderPostDeferred(S32 pass) { render(pass); } | ||
66 | |||
61 | /*virtual*/ void prerender(); | 67 | /*virtual*/ void prerender(); |
62 | /*virtual*/ void render(S32 pass = 0); | 68 | /*virtual*/ void render(S32 pass = 0); |
63 | /*virtual*/ void renderForSelect(); | 69 | /*virtual*/ void renderForSelect(); |