diff options
Diffstat (limited to '')
-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 61194c4..be3ed96 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 |
@@ -1001,7 +1003,7 @@ void assert_glerror() | |||
1001 | 1003 | ||
1002 | if (quit) | 1004 | if (quit) |
1003 | { | 1005 | { |
1004 | llerrs << "One or more unhandled GL errors." << llendl; | 1006 | llwarns << "One or more unhandled GL errors." << llendl; |
1005 | } | 1007 | } |
1006 | } | 1008 | } |
1007 | 1009 | ||
@@ -1695,11 +1697,11 @@ void LLGLNamePool::release(GLuint name) | |||
1695 | } | 1697 | } |
1696 | else | 1698 | else |
1697 | { | 1699 | { |
1698 | llerrs << "Attempted to release a pooled name that is not in use!" << llendl; | 1700 | llwarns << "Attempted to release a pooled name that is not in use!" << llendl; |
1699 | } | 1701 | } |
1700 | } | 1702 | } |
1701 | } | 1703 | } |
1702 | llerrs << "Attempted to release a non pooled name!" << llendl; | 1704 | llwarns << "Attempted to release a non pooled name!" << llendl; |
1703 | #else | 1705 | #else |
1704 | releaseName(name); | 1706 | releaseName(name); |
1705 | #endif | 1707 | #endif |