summaryrefslogtreecommitdiff
path: root/indra/llrender/llgl.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-08-26 18:54:39 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-08-26 18:54:39 -0400
commitf00b6c713347155fbde7e4c68e9656d29c13c6fc (patch)
tree757be382d012da06b2d730f07d06eed41091fb67 /indra/llrender/llgl.cpp
parenta45806e17cc99961ab559f544f43691ccafa9bf2 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
Merge. Pull in viewer-release after SSA merge.
Diffstat (limited to 'indra/llrender/llgl.cpp')
-rwxr-xr-xindra/llrender/llgl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 088ba95b75..c3005f1722 100755
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1154,7 +1154,8 @@ void LLGLManager::initExtensions()
// Misc
glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, (GLint*) &mGLMaxVertexRange);
glGetIntegerv(GL_MAX_ELEMENTS_INDICES, (GLint*) &mGLMaxIndexRange);
-
+ glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint*) &mGLMaxTextureSize);
+
#if (LL_WINDOWS || LL_LINUX || LL_SOLARIS) && !LL_MESA_HEADLESS
LL_DEBUGS("RenderInit") << "GL Probe: Getting symbols" << LL_ENDL;
if (mHasVertexBufferObject)