diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 16:28:33 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 16:28:33 +0100 |
| commit | 02d9320afd91713a28b0b40a249feee064bd4ad2 (patch) | |
| tree | 7704a3f7e684455dfa3561d1a85c8b041f855c09 /indra/llrender | |
| parent | 04d2f64aa7eb679975fc672d932af1472b7feb8f (diff) | |
Let GL errors be caught on Linux - don't know why this was disabled.
(transplanted from a149524a63039870704a498952d9bb3aa599b472)
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 2ee7b16cf3..7ff68fe34b 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1041,7 +1041,7 @@ void flush_glerror() void do_assert_glerror() { - if (!gGLManager.mInited) + if (LL_UNLIKELY(!gGLManager.mInited)) { LL_ERRS("RenderInit") << "GL not initialized" << LL_ENDL; } @@ -1049,10 +1049,9 @@ void do_assert_glerror() GLenum error; error = glGetError(); BOOL quit = FALSE; - while (error) + while (LL_UNLIKELY(error)) { quit = TRUE; -#ifndef LL_LINUX // *FIX: ! This should be an error for linux as well. GLubyte const * gl_error_msg = gluErrorString(error); if (NULL != gl_error_msg) { @@ -1076,7 +1075,6 @@ void do_assert_glerror() } } error = glGetError(); -#endif } if (quit) |