diff options
author | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
---|---|---|
committer | Bill Curtis <bill.curtis@gmail.com> | 2010-11-19 14:11:42 -0800 |
commit | 066d8c39cae11d25dcf72f98bfccd4339973ed42 (patch) | |
tree | 8debcaecdd87271f618daeb8500e7032968c5202 /indra/llrender/llgl.h | |
parent | cb8b30864f08947a23379eabcac63c2ceee62f7c (diff) | |
parent | 3337ef16cee97e26b45aa07518d34d031bdc75fa (diff) |
Automated merge with file:///Users/Bill/Projects/viewer-release
Diffstat (limited to 'indra/llrender/llgl.h')
-rw-r--r-- | indra/llrender/llgl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 5e8965c06a..85fab7a0f8 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -92,6 +92,7 @@ public: BOOL mHasOcclusionQuery; BOOL mHasPointParameters; BOOL mHasDrawBuffers; + BOOL mHasDepthClamp; BOOL mHasTextureRectangle; // Other extensions. @@ -157,6 +158,7 @@ void rotate_quat(LLQuaternion& rotation); void flush_glerror(); // Flush GL errors when we know we're handling them correctly. +void log_glerror(); void assert_glerror(); void clear_glerror(); @@ -315,11 +317,11 @@ private: leaves this class. Does not stack. */ -class LLGLClampToFarClip +class LLGLSquashToFarClip { public: - LLGLClampToFarClip(glh::matrix4f projection); - ~LLGLClampToFarClip(); + LLGLSquashToFarClip(glh::matrix4f projection); + ~LLGLSquashToFarClip(); }; /* |