diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
| commit | ee66cb3efccd6976c5a7725620956ea7030b7b57 (patch) | |
| tree | 7ae469e4d2aac985589e7df902959b27c603b2ad /indra/newview/pipeline.h | |
| parent | 5ef8372e433896be174d7123bd4663087601a0df (diff) | |
| parent | 3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (diff) | |
merge back beta tags
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index b8b4f164fe..f922e3b4f3 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -264,7 +264,7 @@ public: void setHighlightObject(LLDrawable* obj) { mHighlightObject = obj; } - void renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera& camera, LLCullResult& result, BOOL use_shader = TRUE, BOOL use_occlusion = TRUE); + void renderShadow(glh::matrix4f& view, glh::matrix4f& proj, LLCamera& camera, LLCullResult& result, BOOL use_shader, BOOL use_occlusion, U32 target_width); void renderHighlights(); void renderDebug(); void renderPhysicsDisplay(); @@ -464,6 +464,7 @@ public: RENDER_DEBUG_LOD_INFO = 0x04000000, RENDER_DEBUG_RENDER_COMPLEXITY = 0x08000000, RENDER_DEBUG_ATTACHMENT_BYTES = 0x10000000, + RENDER_DEBUG_TEXEL_DENSITY = 0x20000000 }; public: |