diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-21 09:29:44 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-21 09:29:44 -0500 |
| commit | 084ef5173fb79644ce2fd3e640c241a05529db70 (patch) | |
| tree | 4ac2736bbd61f6da01c62b011ef6cd7a18a9fd59 | |
| parent | 061ba0349042b87a5405b42668cfce2f12f8176f (diff) | |
SL-19434 Temporary fix for minimap breakage.
| -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 c42688e95b..f4b580c490 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(); |