diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2023-04-13 09:50:08 -0700 |
|---|---|---|
| committer | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-04-13 11:11:34 -0700 |
| commit | 4f7eabee84cc72abc5f1f8af80dd8f71ac7a2f99 (patch) | |
| tree | 9a4acfafe80e2def9979f7bbdaab22c90992c7c7 /indra | |
| parent | 23365ca51aef2447efa07b0097a421ff864feec1 (diff) | |
SL-19573: Fix alpha mask prims not rendering in HUD
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/pipeline.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index a44452f0d1..1730b02017 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -1146,6 +1146,7 @@ void render_hud_attachments() LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD; gPipeline.updateCull(hud_cam, result); + // Toggle render types gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_BUMP); gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_SIMPLE); gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_VOLUME); @@ -1155,6 +1156,9 @@ void render_hud_attachments() gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_FULLBRIGHT_ALPHA_MASK); gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_FULLBRIGHT); gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_GLTF_PBR); + gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_GLTF_PBR_ALPHA_MASK); + + // Toggle render passes gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_PASS_ALPHA); gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_PASS_ALPHA_MASK); gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_PASS_BUMP); diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index ed9e2dc452..d9decaa1c5 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -472,6 +472,7 @@ public: RENDER_TYPE_VOIDWATER = LLDrawPool::POOL_VOIDWATER, RENDER_TYPE_WATER = LLDrawPool::POOL_WATER, RENDER_TYPE_GLTF_PBR = LLDrawPool::POOL_GLTF_PBR, + RENDER_TYPE_GLTF_PBR_ALPHA_MASK = LLDrawPool::POOL_GLTF_PBR_ALPHA_MASK, RENDER_TYPE_ALPHA = LLDrawPool::POOL_ALPHA, RENDER_TYPE_ALPHA_PRE_WATER = LLDrawPool::POOL_ALPHA_PRE_WATER, RENDER_TYPE_ALPHA_POST_WATER = LLDrawPool::POOL_ALPHA_POST_WATER, |