Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

indra/newview/lldrawpool.h

@@ -48,6 +48,7 @@ public:
 	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 @@ public:
         PASS_FULLBRIGHT_ALPHA_MASK_RIGGED,
 		PASS_ALPHA_INVISIBLE,
         PASS_ALPHA_INVISIBLE_RIGGED,
+        PASS_PBR_OPAQUE,
+        PASS_PBR_OPAQUE_RIGGED,
 		NUM_RENDER_TYPES,
 	};
 

indra/newview/pipeline.cpp

@@ -281,29 +281,33 @@ static LLStaticHashedString sKern("kern");
 static LLStaticHashedString sKernScale("kern_scale");
 
 //----------------------------------------
-std::string gPoolNames[] = 
+#if 0
+std::string gPoolNames[LLDrawPool::NUM_POOL_TYPES] =
 {
 	// Correspond to LLDrawpool enum render type
-	"NONE",
-	"POOL_SIMPLE",
-	"POOL_GROUND",
-	"POOL_FULLBRIGHT",
-	"POOL_BUMP",
-	"POOL_MATERIALS",
-	"POOL_TERRAIN,"	
-	"POOL_SKY",
-	"POOL_WL_SKY",
-	"POOL_TREE",
-	"POOL_ALPHA_MASK",
-	"POOL_FULLBRIGHT_ALPHA_MASK",
-	"POOL_GRASS",
-	"POOL_INVISIBLE",
-	"POOL_AVATAR",
-	"POOL_VOIDWATER",
-	"POOL_WATER",
-	"POOL_GLOW",
-	"POOL_ALPHA"
+	  "NONE"
+	, "POOL_SIMPLE"
+	, "POOL_GROUND"
+	, "POOL_FULLBRIGHT"
+	, "POOL_BUMP"
+	, "POOL_MATERIALS"
+	, "POOL_TERRAIN"
+	, "POOL_SKY"
+	, "POOL_WL_SKY"
+	, "POOL_TREE"
+	, "POOL_ALPHA_MASK"
+	, "POOL_FULLBRIGHT_ALPHA_MASK"
+	, "POOL_GRASS"
+	, "POOL_INVISIBLE"
+	, "POOL_AVATAR"
+	, "POOL_CONTROL_AV" // Animesh
+	, "POOL_VOIDWATER"
+	, "POOL_WATER"
+	, "POOL_GLOW"
+	, "POOL_ALPHA"
+	, "POOL_PBR_OPAQUE"
 };
+#endif
 
 void drawBox(const LLVector4a& c, const LLVector4a& r);
 void drawBoxOutline(const LLVector3& pos, const LLVector3& size);

indra/newview/pipeline.h

@@ -528,6 +528,8 @@ public:
         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,