summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2023-01-19 14:25:14 -0800
committerBrad Linden <brad@lindenlab.com>2023-01-19 14:25:14 -0800
commitd8cdfaa645e68a496f7c5957602a28cbc2db5f53 (patch)
treeec6748cced6c90fc75a57b7e87d489836762ca27 /indra
parent8b39e0e1a6787ae374287dc62064af8576149e86 (diff)
Fix for SL-19010 mac crash in LLManipTranslartge::restoreGL().
Attempt to simplify and avoid use of GL_UNSIGNED_INT_8_8_8_8_REV where not needed
Diffstat (limited to 'indra')
-rw-r--r--indra/llrender/llimagegl.cpp1
-rw-r--r--indra/newview/llmaniptranslate.cpp4
2 files changed, 1 insertions, 4 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index db17f812bd..b3b79bd6c4 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1428,6 +1428,7 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt
{
case GL_UNSIGNED_BYTE:
case GL_BYTE:
+ case GL_UNSIGNED_INT_8_8_8_8_REV:
type_width = 1;
break;
case GL_UNSIGNED_SHORT:
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index b9e68bd6a9..91f1af8f28 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -267,11 +267,7 @@ void LLManipTranslate::restoreGL()
}
}
}
-#ifdef LL_WINDOWS
LLImageGL::setManualImage(GL_TEXTURE_2D, mip, GL_RGBA, rez, rez, GL_RGBA, GL_UNSIGNED_BYTE, d);
-#else
- LLImageGL::setManualImage(GL_TEXTURE_2D, mip, GL_RGBA, rez, rez, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, d);
-#endif
rez = rez >> 1;
mip++;
}