diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-22 18:45:06 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-22 18:45:06 +0200 |
| commit | 6b283f166b0578172962b05145d928a73a322926 (patch) | |
| tree | 90c4980cd8b7444e777b5768add11be302bdf3e2 /indra/newview/llviewerwindow.cpp | |
| parent | 95992bd1a2c14fd88b18c73a068989bd4235bd55 (diff) | |
| parent | 2c4133c8db131b08d40fc91e2881b873ea1a984d (diff) | |
Merge branch 'master' into DRTVWR-460
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 f4c2e93a45..ff5dff1c9b 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4717,7 +4717,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_DEPTH_COMPONENT, 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(); |