diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llrender/llgl.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp index d73f7b6..2e9b2bd 100644 --- a/linden/indra/llrender/llgl.cpp +++ b/linden/indra/llrender/llgl.cpp | |||
@@ -59,13 +59,11 @@ | |||
59 | BOOL gDebugGL = FALSE; | 59 | BOOL gDebugGL = FALSE; |
60 | BOOL gClothRipple = FALSE; | 60 | BOOL gClothRipple = FALSE; |
61 | BOOL gNoRender = FALSE; | 61 | BOOL gNoRender = FALSE; |
62 | BOOL gGLActive = FALSE; | ||
63 | LLMatrix4 gGLObliqueProjectionInverse; | 62 | LLMatrix4 gGLObliqueProjectionInverse; |
64 | 63 | ||
65 | #define LL_GL_NAME_POOLING 0 | 64 | #define LL_GL_NAME_POOLING 0 |
66 | 65 | ||
67 | LLGLNamePool::pool_list_t LLGLNamePool::sInstances; | 66 | LLGLNamePool::pool_list_t LLGLNamePool::sInstances; |
68 | std::list<LLGLUpdate*> LLGLUpdate::sGLQ; | ||
69 | 67 | ||
70 | #if (LL_WINDOWS || LL_LINUX || LL_SOLARIS) && !LL_MESA_HEADLESS | 68 | #if (LL_WINDOWS || LL_LINUX || LL_SOLARIS) && !LL_MESA_HEADLESS |
71 | // ATI prototypes | 69 | // ATI prototypes |
@@ -1011,7 +1009,7 @@ void assert_glerror() | |||
1011 | 1009 | ||
1012 | if (quit) | 1010 | if (quit) |
1013 | { | 1011 | { |
1014 | llwarns << "One or more unhandled GL errors." << llendl; | 1012 | llerrs << "One or more unhandled GL errors." << llendl; |
1015 | } | 1013 | } |
1016 | } | 1014 | } |
1017 | 1015 | ||
@@ -1705,11 +1703,11 @@ void LLGLNamePool::release(GLuint name) | |||
1705 | } | 1703 | } |
1706 | else | 1704 | else |
1707 | { | 1705 | { |
1708 | llwarns << "Attempted to release a pooled name that is not in use!" << llendl; | 1706 | llerrs << "Attempted to release a pooled name that is not in use!" << llendl; |
1709 | } | 1707 | } |
1710 | } | 1708 | } |
1711 | } | 1709 | } |
1712 | llwarns << "Attempted to release a non pooled name!" << llendl; | 1710 | llerrs << "Attempted to release a non pooled name!" << llendl; |
1713 | #else | 1711 | #else |
1714 | releaseName(name); | 1712 | releaseName(name); |
1715 | #endif | 1713 | #endif |