1 files changed, 14 insertions, 14 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index 506baec03d..bf8368a7b3 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -43,7 +43,7 @@
 #include "llinstancetracker.h"
 
 #include "llglheaders.h"
-#include "glh/glh_linear.h"
+#include "glm/mat4x4.hpp"
 
 extern bool gDebugGL;
 extern bool gDebugSession;
@@ -88,6 +88,7 @@ public:
     S32 mGLMaxTextureSize;
     F32 mMaxAnisotropy = 0.f;
     S32 mMaxUniformBlockSize = 0;
+    S32 mMaxVaryingVectors = 0;
 
     // GL 4.x capabilities
     bool mHasCubeMapArray = false;
@@ -102,7 +103,7 @@ public:
     bool mIsAMD;
     bool mIsNVIDIA;
     bool mIsIntel;
-    bool mIsApple;
+    bool mIsApple = false;
 
     // hints to the render pipe
     U32 mDownScaleMethod = 0; // see settings.xml RenderDownScaleMethod
@@ -159,18 +160,17 @@ void assert_glerror();
 void clear_glerror();
 
 
+#if !LL_RELEASE_FOR_DOWNLOAD
 # define stop_glerror() assert_glerror()
 # define llglassertok() assert_glerror()
-
-// stop_glerror is still needed on OS X but has performance implications
-// use macro below to conditionally add stop_glerror to non-release builds
-// on OS X
-#if LL_DARWIN && !LL_RELEASE_FOR_DOWNLOAD
-#define STOP_GLERROR stop_glerror()
+# define STOP_GLERROR stop_glerror()
 #else
-#define STOP_GLERROR
+# define stop_glerror()
+# define llglassertok()
+# define STOP_GLERROR
 #endif
 
+
 #define llglassertok_always() assert_glerror()
 
 ////////////////////////
@@ -318,7 +318,7 @@ class LLGLUserClipPlane
 {
 public:
 
-    LLGLUserClipPlane(const LLPlane& plane, const glh::matrix4f& modelview, const glh::matrix4f& projection, bool apply = true);
+    LLGLUserClipPlane(const LLPlane& plane, const glm::mat4& modelview, const glm::mat4& projection, bool apply = true);
     ~LLGLUserClipPlane();
 
     void setPlane(F32 a, F32 b, F32 c, F32 d);
@@ -327,8 +327,8 @@ public:
 private:
     bool mApply;
 
-    glh::matrix4f mProjection;
-    glh::matrix4f mModelview;
+    glm::mat4 mProjection;
+    glm::mat4 mModelview;
 };
 
 /*
@@ -342,9 +342,9 @@ class LLGLSquashToFarClip
 {
 public:
     LLGLSquashToFarClip();
-    LLGLSquashToFarClip(glh::matrix4f& projection, U32 layer = 0);
+    LLGLSquashToFarClip(const glm::mat4& projection, U32 layer = 0);
 
-    void setProjectionMatrix(glh::matrix4f& projection, U32 layer);
+    void setProjectionMatrix(glm::mat4 projection, U32 layer);
 
     ~LLGLSquashToFarClip();
 };