diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:48:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:48:51 -0500 |
| commit | c44e7128212c52e8fb67a2573db4021ba400b32c (patch) | |
| tree | aa6c1d0f0786a37ec08ece818df23122ac0c4c60 /indra/llrender/llimagegl.cpp | |
| parent | ec0eafbaa0e4c4fbf25bab31ed38d90e998e9dbd (diff) | |
| parent | a98b7003043c49bd687356843f3740f0a50ab258 (diff) | |
merge changes for storm-348
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 65940cb067..e8e98211f1 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1063,16 +1063,6 @@ BOOL LLImageGL::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_ { if (gGL.getTexUnit(0)->bind(this, false, true)) { - if(gGLManager.mDebugGPU) - { - llinfos << "Calling glCopyTexSubImage2D(...)" << llendl ; - checkTexSize(true) ; - llcallstacks << fb_x << " : " << fb_y << " : " << x_pos << " : " << y_pos << " : " << width << " : " << height << - " : " << (S32)mComponents << llcallstacksendl ; - - log_glerror() ; - } - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, fb_x, fb_y, x_pos, y_pos, width, height); mGLTextureCreated = true; stop_glerror(); |