diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-08-30 19:05:58 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-08-30 19:05:58 -0400 |
| commit | cda8a75dd69789d0d9f77c76ab0c461e8791fd60 (patch) | |
| tree | e78e3799988a81205381031888f59f80378a7d5f /indra/llrender/llrendertarget.cpp | |
| parent | 726a26d4bc3b66dafbc8bdfe238c52a0eff23a74 (diff) | |
| parent | 497e84202e169356e66fc91cd8f74b26b34b0c56 (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(); |