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