diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/pipeline.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h index 0e3e1c0..a2a404f 100644 --- a/linden/indra/newview/pipeline.h +++ b/linden/indra/newview/pipeline.h | |||
@@ -72,6 +72,7 @@ void glh_set_current_modelview(glh::matrix4f& mat); | |||
72 | glh::matrix4f glh_get_current_projection(); | 72 | glh::matrix4f glh_get_current_projection(); |
73 | void glh_set_current_projection(glh::matrix4f& mat); | 73 | void glh_set_current_projection(glh::matrix4f& mat); |
74 | glh::matrix4f gl_ortho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat znear, GLfloat zfar); | 74 | glh::matrix4f gl_ortho(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat znear, GLfloat zfar); |
75 | glh::matrix4f gl_perspective(GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar); | ||
75 | 76 | ||
76 | class LLPipeline | 77 | class LLPipeline |
77 | { | 78 | { |
@@ -179,6 +180,8 @@ public: | |||
179 | void grabReferences(LLCullResult& result); | 180 | void grabReferences(LLCullResult& result); |
180 | 181 | ||
181 | void renderGeom(LLCamera& camera, BOOL forceVBOUpdate = FALSE); | 182 | void renderGeom(LLCamera& camera, BOOL forceVBOUpdate = FALSE); |
183 | void renderGeomDeferred(); | ||
184 | |||
182 | void processImagery(LLCamera& camera); | 185 | void processImagery(LLCamera& camera); |
183 | void generateWaterReflection(LLCamera& camera); | 186 | void generateWaterReflection(LLCamera& camera); |
184 | void renderHighlights(); | 187 | void renderHighlights(); |
@@ -328,10 +331,9 @@ public: | |||
328 | RENDER_DEBUG_TEXTURE_ANIM = 0x080000, | 331 | RENDER_DEBUG_TEXTURE_ANIM = 0x080000, |
329 | RENDER_DEBUG_LIGHTS = 0x100000, | 332 | RENDER_DEBUG_LIGHTS = 0x100000, |
330 | RENDER_DEBUG_BATCH_SIZE = 0x200000, | 333 | RENDER_DEBUG_BATCH_SIZE = 0x200000, |
334 | RENDER_DEBUG_SHAME = 0x400000, | ||
331 | }; | 335 | }; |
332 | 336 | ||
333 | LLPointer<LLViewerImage> mAlphaSizzleImagep; | ||
334 | |||
335 | public: | 337 | public: |
336 | 338 | ||
337 | LLSpatialPartition* getSpatialPartition(LLViewerObject* vobj); | 339 | LLSpatialPartition* getSpatialPartition(LLViewerObject* vobj); |