diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-08-22 16:12:40 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-08-22 16:12:40 -0400 |
commit | a3b1a60ed76ac9661bd245e7d5bb801be852944c (patch) | |
tree | 7958d835b5f3a5f210f6361d40f1d5eeee68ef58 /indra/llrender/llrendertarget.cpp | |
parent | 0094c4299f6fb627c0a759374ede39450efdc8d0 (diff) | |
parent | 171089207b528ab80a954292c127ba77254ee927 (diff) |
merge
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
-rwxr-xr-x | indra/llrender/llrendertarget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 6e22712b94..d53c37a847 100755 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -117,8 +117,8 @@ void LLRenderTarget::resize(U32 resx, U32 resy, U32 color_fmt) bool LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, bool stencil, LLTexUnit::eTextureType usage, bool use_fbo, S32 samples) { - resx = llmin(resx, (U32) 4096); - resy = llmin(resy, (U32) 4096); + resx = llmin(resx, (U32) gGLManager.mGLMaxTextureSize); + resy = llmin(resy, (U32) gGLManager.mGLMaxTextureSize); stop_glerror(); release(); |