diff options
| author | Rye Mutt <rye@lindenlab.com> | 2024-10-01 12:48:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-01 12:48:43 -0400 |
| commit | 59ed2d55a1d84ecf879ff564aaf02744f2dc7c7a (patch) | |
| tree | 04f08cc06a0a4135054015e40a7dbcae182a9f25 /indra/llrender/llrender.cpp | |
| parent | 0e0b9eb3b397b213bc6f268eb1690c4794cf3ed3 (diff) | |
| parent | 56fbc6a87ff807fd2be3607cd2ca423030032c5b (diff) | |
Merge pull request #2751 from RyeMutt/rye/continued-sdl-cleanup
Clean up SDL input capture and various small linux fixes
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 565071ff0d..3b74d360d0 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -38,7 +38,7 @@ #include "hbxxh.h" #include "glm/gtc/type_ptr.hpp" -#if LL_WINDOWS +#if GL_ARB_debug_output && !LL_DARWIN extern void APIENTRY gl_debug_callback(GLenum source, GLenum type, GLuint id, @@ -866,7 +866,7 @@ LLRender::~LLRender() bool LLRender::init(bool needs_vertex_buffer) { -#if LL_WINDOWS +#if GL_ARB_debug_output && !LL_DARWIN if (gGLManager.mHasDebugOutput && gDebugGL) { //setup debug output callback //glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DEBUG_SEVERITY_LOW_ARB, 0, NULL, GL_TRUE); |