From 8fa6bcb5a5abdf0c4649df65c900dee66c3ccddc Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Thu, 23 Jun 2022 14:36:03 -0700
Subject: [PATCH] SL-17273: Add RENDER_TYPE_PASS_PBR_OPAQUE
---
indra/newview/lldrawpool.h | 4 ++++
indra/newview/pipeline.h | 2 ++
2 files changed, 6 insertions(+)
diff --git a/indra/newview/lldrawpool.h b/indra/newview/lldrawpool.h
index b73ae94bbb6..f7fc2d20611 100644
--- a/indra/newview/lldrawpool.h
+++ b/indra/newview/lldrawpool.h
@@ -48,6 +48,7 @@ class LLDrawPool
enum
{
// Correspond to LLPipeline render type
+ // NOTE: Keep in sync with gPoolNames
POOL_SIMPLE = 1,
POOL_GROUND,
POOL_FULLBRIGHT,
@@ -130,6 +131,7 @@ class LLRenderPass : public LLDrawPool
public:
// list of possible LLRenderPass types to assign a render batch to
// NOTE: "rigged" variant MUST be non-rigged variant + 1
+ // see LLVolumeGeometryManager::registerFace()
enum
{
PASS_SIMPLE = NUM_POOL_TYPES,
@@ -191,6 +193,8 @@ class LLRenderPass : public LLDrawPool
PASS_FULLBRIGHT_ALPHA_MASK_RIGGED,
PASS_ALPHA_INVISIBLE,
PASS_ALPHA_INVISIBLE_RIGGED,
+ PASS_PBR_OPAQUE,
+ PASS_PBR_OPAQUE_RIGGED,
NUM_RENDER_TYPES,
};
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index c83d7c16eba..cd7d0b88d8a 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -528,6 +528,8 @@ class LLPipeline
RENDER_TYPE_PASS_NORMSPEC_MASK_RIGGED = LLRenderPass::PASS_NORMSPEC_MASK_RIGGED,
RENDER_TYPE_PASS_NORMSPEC_EMISSIVE = LLRenderPass::PASS_NORMSPEC_EMISSIVE,
RENDER_TYPE_PASS_NORMSPEC_EMISSIVE_RIGGED = LLRenderPass::PASS_NORMSPEC_EMISSIVE_RIGGED,
+ RENDER_TYPE_PASS_PBR_OPAQUE = LLRenderPass::PASS_PBR_OPAQUE,
+ RENDER_TYPE_PASS_PBR_OPAQUE_RIGGED = LLRenderPass::PASS_PBR_OPAQUE_RIGGED,
// Following are object types (only used in drawable mRenderType)
RENDER_TYPE_HUD = LLRenderPass::NUM_RENDER_TYPES,
RENDER_TYPE_VOLUME,
--
GitLab