diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2023-03-21 14:27:37 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2023-03-21 14:27:37 -0700 |
| commit | 7d97008ebaa08212fd4e3dcb9a01861b4adff728 (patch) | |
| tree | 2898b093006b068ec73dd00e68bf7d74ce5aebfe /indra/llrender | |
| parent | b30cde2a05c5217018d8be7608f14bda8b66127a (diff) | |
Revert "SL-19434 Temporary fix for minimap breakage."
This reverts commit 084ef5173fb79644ce2fd3e640c241a05529db70.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index f4b580c490..c42688e95b 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1219,12 +1219,12 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3 if (!res) LL_ERRS() << "LLImageGL::setSubImage(): bindTexture failed" << LL_ENDL; stop_glerror(); -//#if LL_DARWIN -// const bool use_sub_image = false; -//#else -// const bool use_sub_image = !isCompressed(); -//#endif - //if (!use_sub_image) +#if LL_DARWIN + const bool use_sub_image = false; +#else + const bool use_sub_image = !isCompressed(); +#endif + if (!use_sub_image) { // *TODO: Why does this work here, in setSubImage, but not in // setManualImage? Maybe because it only gets called with the @@ -1232,10 +1232,10 @@ BOOL LLImageGL::setSubImage(const U8* datap, S32 data_width, S32 data_height, S3 // compressed? glTexSubImage2D(mTarget, 0, x_pos, y_pos, width, height, mFormatPrimary, mFormatType, datap); } - //else - //{ - // subImageLines(mTarget, 0, x_pos, y_pos, width, height, mFormatPrimary, mFormatType, datap); - //} + else + { + subImageLines(mTarget, 0, x_pos, y_pos, width, height, mFormatPrimary, mFormatType, datap); + } gGL.getTexUnit(0)->disable(); stop_glerror(); |