diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-19 17:27:41 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-19 17:27:41 -0500 |
| commit | a5233ed7747be6fb340e76544acb1a92399c042d (patch) | |
| tree | c8a251e055f75db9139ee9f202113f8e97dd4697 /indra/llappearance/lltexlayer.cpp | |
| parent | 04d3a29a699cd0a4c08ab096bfbab153e65c1fd1 (diff) | |
| parent | 718073717c70b1f7e7284a02641c0a0a7bf50367 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llappearance/lltexlayer.cpp')
| -rw-r--r-- | indra/llappearance/lltexlayer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp index 3430a25536..e1a3a83841 100644 --- a/indra/llappearance/lltexlayer.cpp +++ b/indra/llappearance/lltexlayer.cpp @@ -1509,7 +1509,14 @@ void LLTexLayer::renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLC } else { // platforms with working drivers... - glReadPixels(x, y, width, height, GL_ALPHA, GL_UNSIGNED_BYTE, alpha_data); + // We just want GL_ALPHA, but that isn't supported in OGL core profile 4. + static const size_t TEMP_BYTES_PER_PIXEL = 4; + U8* temp_data = (U8*)ll_aligned_malloc_32(mem_size * TEMP_BYTES_PER_PIXEL); + glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, temp_data); + for (size_t pixel = 0; pixel < pixels; pixel++) { + alpha_data[pixel] = temp_data[(pixel * TEMP_BYTES_PER_PIXEL) + 3]; + } + ll_aligned_free_32(temp_data); } } else |