From 118cbb97159f45dce9a5c9f6b2084f5af7b7cc70 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 7 Nov 2020 02:03:43 -0500
Subject: [PATCH] Get libepoxy working on macos
---
indra/llrender/llglheaders.h | 4 ++++
indra/llrender/llglslshader.cpp | 4 ----
indra/llrender/llshadermgr.cpp | 8 ++------
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
index fa66b66e03e..c773fd62bce 100644
--- a/indra/llrender/llglheaders.h
+++ b/indra/llrender/llglheaders.h
@@ -54,7 +54,11 @@
#include "epoxy/glx.h"
#endif
+#if LL_DARWIN
+#include <OpenGL/glu.h>
+#else
#include <GL/glu.h>
+#endif
#endif // LL_MESA
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 0579a8242e3..ab00a24419b 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -33,10 +33,6 @@
#include "llrender.h"
#include "llvertexbuffer.h"
-#if LL_DARWIN
-#include "OpenGL/OpenGL.h"
-#endif
-
// Lots of STL stuff in here, using namespace std to keep things more readable
using std::vector;
using std::pair;
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 127f9ab2771..ae39aefeb89 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -29,10 +29,6 @@
#include "llrender.h"
#include "llfile.h"
-#if LL_DARWIN
-#include "OpenGL/OpenGL.h"
-#endif
-
// Lots of STL stuff in here, using namespace std to keep things more readable
using std::vector;
using std::pair;
@@ -1082,7 +1078,7 @@ BOOL LLShaderMgr::linkProgramObject(GLuint obj, BOOL suppress_errors)
#if LL_DARWIN
// For some reason this absolutely kills the frame rate when VBO's are enabled
- if (0)
+ /*if (0)
{
// Force an evaluation of the gl state so the driver can tell if the shader will run in hardware or software
// per Apple's suggestion
@@ -1113,7 +1109,7 @@ BOOL LLShaderMgr::linkProgramObject(GLuint obj, BOOL suppress_errors)
success = GL_FALSE;
suppress_errors = FALSE;
}
- }
+ }*/
#else
std::string log = get_program_log(obj);
--
GitLab