diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-02-21 12:05:46 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-02-21 12:05:46 -0700 |
commit | 7674c00fb934b1269192553ccd0cd029d65a4e24 (patch) | |
tree | b5ac7ac56e27105fcbf04d02aaebe31fdb6ce083 /indra/newview/llviewerwindow.cpp | |
parent | 01d4fd2451f6ba2f4f17c7fbf0f9511d37b20e21 (diff) | |
parent | 2c4133c8db131b08d40fc91e2881b873ea1a984d (diff) |
Merge master (v 6.3.8) into DRTVWR-440
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e24e9ef28e..b238256b7f 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4733,7 +4733,8 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei if ((image_width <= gGLManager.mGLMaxTextureSize && image_height <= gGLManager.mGLMaxTextureSize) && (image_width > window_width || image_height > window_height) && LLPipeline::sRenderDeferred && !show_ui) { - if (scratch_space.allocate(image_width, image_height, GL_RGBA, true, true)) + U32 color_fmt = type == LLSnapshotModel::SNAPSHOT_TYPE_DEPTH ? GL_DEPTH_COMPONENT : GL_RGBA; + if (scratch_space.allocate(image_width, image_height, color_fmt, true, true)) { original_width = gPipeline.mDeferredScreen.getWidth(); original_height = gPipeline.mDeferredScreen.getHeight(); |