From 9e2e1500640a20b8c89e13a103f60b4679afd6b2 Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Fri, 7 Dec 2012 11:07:41 -0500
Subject: Check to see if GL_EXT_texture_sRGB and GL_ARB_framebuffer_sRGB are
 available.

---
 indra/llrender/llgl.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llrender/llgl.h')

diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index d70e764769..1e921d1e97 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -115,6 +115,8 @@ public:
 	BOOL mHasARBEnvCombine;
 	BOOL mHasCubeMap;
 	BOOL mHasDebugOutput;
+	BOOL mHassRGBTexture;
+	BOOL mHassRGBFramebuffer;
 
 	// Vendor-specific extensions
 	BOOL mIsATI;
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/llrender/llgl.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/llrender/llgl.h

(limited to 'indra/llrender/llgl.h')

diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 893bcf34f7daa432ce70224b4d30d3c22f9c80ad Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Tue, 9 Apr 2013 12:37:57 -0700
Subject: NORSPEC-59 work around nV driver crash when doing deferred rendering
 on NV 9400M/9600M

---
 indra/llrender/llgl.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llrender/llgl.h')

diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index 1e921d1e97..767d49cbf2 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -128,6 +128,11 @@ public:
 	BOOL mATIOffsetVerticalLines;
 	BOOL mATIOldDriver;
 
+#if LL_DARWIN
+	// Needed to distinguish problem cards on older Macs that break with Materials
+	BOOL mIsMobileGF;
+#endif
+	
 	// Whether this version of GL is good enough for SL to use
 	BOOL mHasRequirements;
 
-- 
cgit v1.2.3


From 8025b8b2bc6028ed268e191d432cb3f740e351db Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 15 Apr 2013 13:16:14 -0500
Subject: NORSPEC-49 Add shader profiler, add support for ARB_depth_clamp where
 available

---
 indra/llrender/llgl.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llrender/llgl.h')

diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index 767d49cbf2..60597fd090 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -98,6 +98,7 @@ public:
 	BOOL mHasFragmentShader;
 	S32  mNumTextureImageUnits;
 	BOOL mHasOcclusionQuery;
+	BOOL mHasTimerQuery;
 	BOOL mHasOcclusionQuery2;
 	BOOL mHasPointParameters;
 	BOOL mHasDrawBuffers;
-- 
cgit v1.2.3