From 5e12beba702edb036b00690e7d810a3973cc96af Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 2 Jul 2018 19:30:31 +0100
Subject: MAINT-7548 MAINT-7560 use NvidiaOptimusEnablement globally exported
 var to signal desire to use high-performance graphics processor

---
 indra/llrender/llgl.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 35b6951779..f8aa63c16f 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -2561,5 +2561,10 @@ void LLGLSyncFence::wait()
 #endif
 }
 
-
-
+#if LL_WINDOWS
+// Expose desired use of high-performance graphics processor to Optimus driver
+extern "C" 
+{ 
+    _declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; 
+}
+#endif
\ No newline at end of file
-- 
cgit v1.2.3


From c877eac422dc0d1116547d4cb83e618f0b5b6741 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 4 Jul 2018 11:56:01 +0300
Subject: Fixed line endings in llgl.cpp

---
 indra/llrender/llgl.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index f8aa63c16f..79a50d199a 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -2563,8 +2563,9 @@ void LLGLSyncFence::wait()
 
 #if LL_WINDOWS
 // Expose desired use of high-performance graphics processor to Optimus driver
-extern "C" 
-{ 
-    _declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; 
-}
-#endif
\ No newline at end of file
+extern "C" 
+{ 
+    _declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; 
+}
+#endif
+
-- 
cgit v1.2.3


From 4f458882f4f29d441e1ba0ede1ab50aa389b2aaa Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Mon, 14 Jan 2019 18:58:30 +0200
Subject: - add static const

---
 indra/llrender/llgl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 79a50d199a..c0f0cec80b 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1890,7 +1890,7 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask)
 		GL_TEXTURE_COORD_ARRAY
 	};
 
-	 U32 mask[] = 
+	static const U32 mask[] = 
 	{ //copied from llvertexbuffer.h
 		0x0001, //MAP_VERTEX,
 		0x0002, //MAP_NORMAL,
-- 
cgit v1.2.3