diff options
| author | simon <none@none> | 2013-05-13 16:34:52 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-13 16:34:52 -0700 |
| commit | b864cecd6c938b18cf05f7695f33f4da3b608a47 (patch) | |
| tree | e003bec0f2a9bfc38464ad8364a92a98ed3d68b3 /indra/llrender | |
| parent | 180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff) | |
De-bork the viewer merge, causing black in-world images. Reviewed by Kelly
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llimagegl.cpp | 9 | ||||
| -rwxr-xr-x | indra/llrender/llshadermgr.cpp | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 5aef2c972e..0a0429846a 100755 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -715,12 +715,9 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips) mMipLevels = wpo2(llmax(w, h)); - if (!gGLManager.mHasFramebufferObject) - { - //use legacy mipmap generation mode - glTexParameteri(mTarget, GL_GENERATE_MIPMAP, GL_TRUE); - } - + //use legacy mipmap generation mode (note: making this condional can cause rendering issues) + glTexParameteri(mTarget, GL_GENERATE_MIPMAP, GL_TRUE); + LLImageGL::setManualImage(mTarget, 0, mFormatInternal, w, h, mFormatPrimary, mFormatType, diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 825f80a6dc..4893b1d043 100755 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -1120,8 +1120,6 @@ void LLShaderMgr::initAttribsAndUniforms() mReservedUniforms.push_back("matrixPalette"); - - mReservedUniforms.reserve(12); mReservedUniforms.push_back("screenTex"); mReservedUniforms.push_back("screenDepth"); mReservedUniforms.push_back("refTex"); |