5 files changed, 38 insertions, 18 deletions

diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index da5eda0..946f52f 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -311,7 +311,7 @@ BOOL LLFont::addChar(const llwchar wch) const
                 // Try looking it up in the backup Unicode font
                 if (mFallbackFontp)
                 {
-                        //llinfos << "Trying to add glyph from fallback font!" << llendl
+                        //llinfos << "Trying to add glyph from fallback font!" << llendl;
                         LLFontList::iterator iter;
                         for(iter = mFallbackFontp->begin(); iter != mFallbackFontp->end(); iter++)
                         {
diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index b1d8c5c..9792a91 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -107,7 +107,7 @@ bool removeSubString(std::string& str, const std::string& substr)
         size_t pos = str.find(substr);
         if (pos != string::npos)
         {
-                str.replace(pos,substr.length(),(const char *)NULL, 0);
+                str.erase(pos,substr.length());
                 return true;
         }
         return false;
@@ -442,12 +442,13 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
                 std::string font_path = local_path + *file_name_it;
                 BOOL is_fallback = !is_first_found;
                 F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult());
-                if (!fontp->loadFace(font_path, point_size * size_mult,
+                F32 size = (F32)llround(point_size * size_mult);
+                if (!fontp->loadFace(font_path, size,
                                                          LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
                 {
                         font_path = sys_path + *file_name_it;
 
-                        if (!fontp->loadFace(font_path, point_size * size_mult,
+                        if (!fontp->loadFace(font_path, size,
                                                                  LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
                         {
                                 LL_INFOS_ONCE("LLFontRegistry") << "Couldn't load font " << *file_name_it << LL_ENDL;
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index be3ed96..d73f7b6 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -554,41 +554,46 @@ extern LLCPUInfo gSysCPU;
 void LLGLManager::initExtensions()
 {
 #if LL_MESA_HEADLESS
-# if GL_ARB_multitexture
+# ifdef GL_ARB_multitexture
         mHasMultitexture = TRUE;
 # else
         mHasMultitexture = FALSE;
 # endif
-# if GL_ARB_texture_env_combine
-        mHasARBEnvCombine = TRUE;       
+# ifdef GL_ARB_texture_env_combine
+        mHasARBEnvCombine = TRUE;
 # else
         mHasARBEnvCombine = FALSE;
 # endif
-# if GL_ARB_texture_compression
+# ifdef GL_ARB_texture_compression
         mHasCompressedTextures = TRUE;
 # else
         mHasCompressedTextures = FALSE;
 # endif
-# if GL_ARB_vertex_buffer_object
+# ifdef GL_ARB_vertex_buffer_object
         mHasVertexBufferObject = TRUE;
 # else
         mHasVertexBufferObject = FALSE;
 # endif
-# if GL_EXT_framebuffer_object
+# ifdef GL_EXT_framebuffer_object
         mHasFramebufferObject = TRUE;
 # else
         mHasFramebufferObject = FALSE;
 # endif
-# if GL_EXT_framebuffer_multisample
+# ifdef GL_EXT_framebuffer_multisample
         mHasFramebufferMultisample = TRUE;
 # else
         mHasFramebufferMultisample = FALSE;
 # endif
-# if GL_ARB_draw_buffers
+# ifdef GL_ARB_draw_buffers
         mHasDrawBuffers = TRUE;
 #else
         mHasDrawBuffers = FALSE;
 # endif
+# if defined(GL_NV_depth_clamp) || defined(GL_ARB_depth_clamp)
+        mHasDepthClamp = TRUE;
+#else
+        mHasDepthClamp = FALSE;
+#endif
         mHasMipMapGeneration = FALSE;
         mHasSeparateSpecularColor = FALSE;
         mHasAnisotropic = FALSE;
@@ -614,6 +619,7 @@ void LLGLManager::initExtensions()
                 && ExtensionExists("GL_EXT_packed_depth_stencil", gGLHExts.mSysExts);
         mHasFramebufferMultisample = mHasFramebufferObject && ExtensionExists("GL_EXT_framebuffer_multisample", gGLHExts.mSysExts);
         mHasDrawBuffers = ExtensionExists("GL_ARB_draw_buffers", gGLHExts.mSysExts);
+        mHasDepthClamp = ExtensionExists("GL_ARB_depth_clamp", gGLHExts.mSysExts) || ExtensionExists("GL_NV_depth_clamp", gGLHExts.mSysExts);
 #if !LL_DARWIN
         mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
 #endif
@@ -636,6 +642,7 @@ void LLGLManager::initExtensions()
                 mHasFramebufferObject = FALSE;
                 mHasFramebufferMultisample = FALSE;
                 mHasDrawBuffers = FALSE;
+                mHasDepthClamp = FALSE;
                 mHasMipMapGeneration = FALSE;
                 mHasSeparateSpecularColor = FALSE;
                 mHasAnisotropic = FALSE;
@@ -687,10 +694,11 @@ void LLGLManager::initExtensions()
                 if (strchr(blacklist,'q')) mHasFramebufferObject = FALSE;//S
                 if (strchr(blacklist,'r')) mHasDrawBuffers = FALSE;//S
                 if (strchr(blacklist,'s')) mHasFramebufferMultisample = FALSE;
+                if (strchr(blacklist,'t')) mHasDepthClamp = FALSE;
 
         }
 #endif // LL_LINUX || LL_SOLARIS
-        
+
         if (!mHasMultitexture)
         {
                 LL_INFOS("RenderInit") << "Couldn't initialize multitexturing" << LL_ENDL;
@@ -1775,7 +1783,7 @@ LLGLDepthTest::~LLGLDepthTest()
         }
 }
 
-LLGLClampToFarClip::LLGLClampToFarClip(glh::matrix4f P)
+LLGLSquashToFarClip::LLGLSquashToFarClip(glh::matrix4f P)
 {
         for (U32 i = 0; i < 4; i++)
         {
@@ -1788,7 +1796,7 @@ LLGLClampToFarClip::LLGLClampToFarClip(glh::matrix4f P)
         glMatrixMode(GL_MODELVIEW);
 }
 
-LLGLClampToFarClip::~LLGLClampToFarClip()
+LLGLSquashToFarClip::~LLGLSquashToFarClip()
 {
         glMatrixMode(GL_PROJECTION);
         glPopMatrix();
diff --git a/linden/indra/llrender/llgl.h b/linden/indra/llrender/llgl.h
index 88552ce..90642b3 100644
--- a/linden/indra/llrender/llgl.h
+++ b/linden/indra/llrender/llgl.h
@@ -88,6 +88,7 @@ public:
         BOOL mHasOcclusionQuery;
         BOOL mHasPointParameters;
         BOOL mHasDrawBuffers;
+        BOOL mHasDepthClamp;
 
         // Other extensions.
         BOOL mHasAnisotropic;
@@ -306,11 +307,11 @@ private:
   leaves this class.
   Does not stack.
 */
-class LLGLClampToFarClip
+class LLGLSquashToFarClip
 {
 public:
-        LLGLClampToFarClip(glh::matrix4f projection);
-        ~LLGLClampToFarClip();
+        LLGLSquashToFarClip(glh::matrix4f projection);
+        ~LLGLSquashToFarClip();
 };
 
 /*
diff --git a/linden/indra/llrender/llglheaders.h b/linden/indra/llrender/llglheaders.h
index c7178a5..9e3ae9d 100644
--- a/linden/indra/llrender/llglheaders.h
+++ b/linden/indra/llrender/llglheaders.h
@@ -819,5 +819,15 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 
 #endif // LL_MESA / LL_WINDOWS / LL_DARWIN
 
+// Even when GL_ARB_depth_clamp is available in the driver, the (correct)
+// headers, and therefore GL_DEPTH_CLAMP might not be defined.
+// In that case GL_DEPTH_CLAMP_NV should be defined, but why not just
+// use the known numeric.
+//
+// To avoid #ifdef's in the code. Just define this here.
+#ifndef GL_DEPTH_CLAMP
+// Probably (still) called GL_DEPTH_CLAMP_NV.
+#define GL_DEPTH_CLAMP 0x864F
+#endif
 
 #endif // LL_LLGLHEADERS_H