Optimisations and experimental HDR display support on mac

This commit completes the previous ones for performance optimisations,
and adds HDR display support on mac

1 files changed, 10 insertions, 7 deletions

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index d0e268f08c..5d26a69d7b 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -530,7 +530,9 @@ void LLTexUnit::setTextureFilteringOption(LLTexUnit::eTextureFilterOptions optio
     {
         if (LLImageGL::sGlobalUseAnisotropic && option == TFO_ANISOTROPIC)
         {
-            glTexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, gGLManager.mMaxAnisotropy);
+            //glTexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, gGLManager.mMaxAnisotropy);
+            //We plan to add a setting. For now we stick to a low value.
+            glTexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, 4.0);
         }
         else
         {
@@ -1592,7 +1594,6 @@ void LLRender::end(std::string comment_)
 
 void LLRender::flush(std::string comment_)
 {
-    LOG_GLERROR("LLRender::flush() begin " + comment_);
     if (mCount > 0)
     {
         LL_PROFILE_ZONE_SCOPED_CATEGORY_PIPELINE;
@@ -1661,9 +1662,9 @@ void LLRender::flush(std::string comment_)
         }
 
         resetStriders(count);
-    }
 
-    LOG_GLERROR("LLRender::flush() end " + comment_);
+        LOG_GLERROR("LLRender::flush() end " + comment_);
+    }
 }
 
 LLVertexBuffer* LLRender::bufferfromCache(U32 attribute_mask, U32 count)
@@ -1760,9 +1761,11 @@ LLVertexBuffer* LLRender::genBuffer(U32 attribute_mask, S32 count)
         vb->setColorData(mColorsp.get());
     }
 
-#if LL_DARWIN
-    vb->unmapBuffer();
-#endif
+    if(gGLManager.mIsApple && LLVertexBuffer::getVertexBufferMode() == 0)
+    {
+        vb->unmapBuffer();
+    }
+
     vb->unbind();
 
     return vb;