Revert "Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing""

This reverts commit 2318d657660320b921e1566b54d3833c0401a34c.

6 files changed, 77 insertions, 44 deletions

diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp
index 8442e61bb9..926d5e78d0 100644
--- a/indra/newview/lldrawpoolterrain.cpp
+++ b/indra/newview/lldrawpoolterrain.cpp
@@ -253,7 +253,7 @@ void LLDrawPoolTerrain::renderFullShader()
 	// Hack! Get the region that this draw pool is rendering from!
 	LLViewerRegion *regionp = mDrawFace[0]->getDrawable()->getVObj()->getRegion();
 	LLVLComposition *compp = regionp->getComposition();
-    const BOOL use_textures = !use_local_materials && compp->useTextures();
+    const BOOL use_textures = !use_local_materials && (compp->getMaterialType() == LLTerrainMaterials::MaterialType::TEXTURE);
     
     if (use_textures)
     {
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp
index 449d3d95c8..81fb4cf0cd 100644
--- a/indra/newview/llsurfacepatch.cpp
+++ b/indra/newview/llsurfacepatch.cpp
@@ -209,6 +209,7 @@ void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3
 	}
 	llassert_always(vertex && normal && tex0 && tex1);
 	
+    // TODO: I think this is off by 1. Should use 1 less (which iirc is captured in another field member. See LLSurface::create). Do some hack to fix repeats for PBR only, while keeping legacy texture the same?
 	U32 surface_stride = mSurfacep->getGridsPerEdge();
 	U32 point_offset = x + y*surface_stride;
 
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp
index 8d55c80be8..8cd22e3bdb 100644
--- a/indra/newview/llvlcomposition.cpp
+++ b/indra/newview/llvlcomposition.cpp
@@ -119,13 +119,20 @@ void LLTerrainMaterials::setDetailAssetID(S32 asset, const LLUUID& id)
     mMaterialTexturesSet[asset] = false;
 }
 
-BOOL LLTerrainMaterials::useTextures()
+BOOL LLTerrainMaterials::getMaterialType()
+{
+    return mMaterialType;
+}
+
+void LLTerrainMaterials::updateMaterialType()
 {
 	LL_PROFILE_ZONE_SCOPED;
 
-    return texturesReady() || !materialsReady();
+    const BOOL use_textures = texturesReady() || !materialsReady();
+    mMaterialType = use_textures ? Type::TEXTURE : Type::PBR;
 }
 
+
 BOOL LLTerrainMaterials::texturesReady(BOOL boost)
 {
 	for (S32 i = 0; i < ASSET_COUNT; i++)
@@ -401,7 +408,7 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
 	U8* st_data[ASSET_COUNT];
 	S32 st_data_size[ASSET_COUNT]; // for debugging
 
-    const bool use_textures = useTextures();
+    const bool use_textures = getMaterialType() != LLTerrainMaterial::Type::PBR;
 
 	for (S32 i = 0; i < ASSET_COUNT; i++)
 	{
diff --git a/indra/newview/llvlcomposition.h b/indra/newview/llvlcomposition.h
index 9dc0b7221e..882c3d89b2 100644
--- a/indra/newview/llvlcomposition.h
+++ b/indra/newview/llvlcomposition.h
@@ -49,11 +49,18 @@ public:
 	// So we need to compress heights into this range.
     static const S32 ASSET_COUNT = 4;
 
+    enum class Type
+    {
+        TEXTURE,
+        PBR,
+        COUNT
+    };
+
     BOOL generateMaterials();
 
 	LLUUID getDetailAssetID(S32 asset);
 	virtual void setDetailAssetID(S32 asset, const LLUUID& id);
-    BOOL useTextures();
+    Type getMaterialType();
     BOOL texturesReady(BOOL boost = FALSE);
     BOOL materialsReady(BOOL boost = FALSE);
 
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp
index 839eb2b737..69b721c899 100644
--- a/indra/newview/llvosurfacepatch.cpp
+++ b/indra/newview/llvosurfacepatch.cpp
@@ -246,7 +246,8 @@ void LLVOSurfacePatch::getTerrainGeometry(LLStrider<LLVector3> &verticesp,
                                               LLStrider<LLVector3> &normalsp,
                                               LLStrider<LLVector2> &texCoords0p,
                                               LLStrider<LLVector2> &texCoords1p,
-                                              LLStrider<U16> &indicesp)
+                                              LLStrider<U16> &indicesp,
+                                              bool pbr)
 {
 	LLFace* facep = mDrawable->getFace(0);
     if (!facep)
@@ -262,30 +263,34 @@ void LLVOSurfacePatch::getTerrainGeometry(LLStrider<LLVector3> &verticesp,
                     texCoords0p,
                     texCoords1p,
                     indicesp,
-                    index_offset);
+                    index_offset,
+                    pbr);
     updateNorthGeometry(facep, 
                         verticesp,
                         normalsp,
                         texCoords0p,
                         texCoords1p,
                         indicesp,
-                        index_offset);
+                        index_offset,
+                        pbr);
     updateEastGeometry(facep, 
                         verticesp,
                         normalsp,
                         texCoords0p,
                         texCoords1p,
                         indicesp,
-                        index_offset);
+                        index_offset,
+                        pbr);
 }
 
 void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
-										LLStrider<LLVector3> &verticesp,
-										LLStrider<LLVector3> &normalsp,
-										LLStrider<LLVector2> &texCoords0p,
-										LLStrider<LLVector2> &texCoords1p,
-										LLStrider<U16> &indicesp,
-										U32 &index_offset)
+                                        LLStrider<LLVector3> &verticesp,
+                                        LLStrider<LLVector3> &normalsp,
+                                        LLStrider<LLVector2> &texCoords0p,
+                                        LLStrider<LLVector2> &texCoords1p,
+                                        LLStrider<U16> &indicesp,
+                                        U32 &index_offset,
+                                        bool pbr)
 {
 	S32 i, j, x, y;
 
@@ -321,7 +326,7 @@ void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
 			{
 				x = i * render_stride;
 				y = j * render_stride;
-				mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+				mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 				verticesp++;
 				normalsp++;
 				texCoords0p++;
@@ -384,12 +389,13 @@ void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
 
 
 void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
-										LLStrider<LLVector3> &verticesp,
-										LLStrider<LLVector3> &normalsp,
-										LLStrider<LLVector2> &texCoords0p,
-										LLStrider<LLVector2> &texCoords1p,
-										LLStrider<U16> &indicesp,
-										U32 &index_offset)
+                                        LLStrider<LLVector3> &verticesp,
+                                        LLStrider<LLVector3> &normalsp,
+                                        LLStrider<LLVector2> &texCoords0p,
+                                        LLStrider<LLVector2> &texCoords1p,
+                                        LLStrider<U16> &indicesp,
+                                        U32 &index_offset,
+                                        bool pbr)
 {
 	S32 vertex_count = 0;
 	S32 i, x, y;
@@ -421,7 +427,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			x = i * render_stride;
 			y = 16 - render_stride;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -434,7 +440,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 		{
 			x = i * render_stride;
 			y = 16;
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -471,7 +477,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			x = i * render_stride;
 			y = 16 - render_stride;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -485,7 +491,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			x = i * render_stride;
 			y = 16;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -529,7 +535,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			x = i * north_stride;
 			y = 16 - render_stride;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -543,7 +549,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 			x = i * north_stride;
 			y = 16;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -581,12 +587,13 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 }
 
 void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
-										  LLStrider<LLVector3> &verticesp,
-										  LLStrider<LLVector3> &normalsp,
-										  LLStrider<LLVector2> &texCoords0p,
-										  LLStrider<LLVector2> &texCoords1p,
-										  LLStrider<U16> &indicesp,
-										  U32 &index_offset)
+                                          LLStrider<LLVector3> &verticesp,
+                                          LLStrider<LLVector3> &normalsp,
+                                          LLStrider<LLVector2> &texCoords0p,
+                                          LLStrider<LLVector2> &texCoords1p,
+                                          LLStrider<U16> &indicesp,
+                                          U32 &index_offset,
+                                          bool pbr)
 {
 	S32 i, x, y;
 
@@ -612,7 +619,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 			x = 16 - render_stride;
 			y = i * render_stride;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -624,7 +631,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 		{
 			x = 16;
 			y = i * render_stride;
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -660,7 +667,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 			x = 16 - render_stride;
 			y = i * render_stride;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -672,7 +679,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 			x = 16;
 			y = i * render_stride;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -714,7 +721,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 			x = 16 - render_stride;
 			y = i * east_stride;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -726,7 +733,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 			x = 16;
 			y = i * east_stride;
 
-			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
+			mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get(), pbr);
 			verticesp++;
 			normalsp++;
 			texCoords0p++;
@@ -1037,6 +1044,13 @@ void LLTerrainPartition::getGeometry(LLSpatialGroup* group)
 {
     LL_PROFILE_ZONE_SCOPED;
 
+    const LLFace* region_facep = *mFaceList.begin();
+    const LLViewerObject* region_patchp = region_facep->getViewerObject();
+    LLVLComposition* composition = region_patchp->mRegionp->getComposition();
+    // TODO: This is not good; it will result in wrong texture repeats in cases where the assets have not loaded. Need to rebuild terrain on asset load event if it changes the composition type. Probably best to have a flag to bookkeep that, to know if the composition type has actually changed. Make sure the draw pool is boosting the textures so they load in a timely fashion.
+    composition->updateMaterialType();
+    const bool pbr = composition->getMaterialType() == LLTerrainMaterial::Type::PBR;
+
 	LLVertexBuffer* buffer = group->mVertexBuffer;
 
 	//get vertex buffer striders
diff --git a/indra/newview/llvosurfacepatch.h b/indra/newview/llvosurfacepatch.h
index a3dcb945d1..06bb373578 100644
--- a/indra/newview/llvosurfacepatch.h
+++ b/indra/newview/llvosurfacepatch.h
@@ -67,7 +67,8 @@ public:
                                 LLStrider<LLVector3> &normalsp,
                                 LLStrider<LLVector2> &texCoords0p,
                                 LLStrider<LLVector2> &texCoords1p,
-                                LLStrider<U16> &indicesp);
+                                LLStrider<U16> &indicesp,
+                                bool pbr);
 
 	/*virtual*/ void updateTextures();
 	/*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
@@ -121,21 +122,24 @@ protected:
 					   LLStrider<LLVector2> &texCoords0p,
 					   LLStrider<LLVector2> &texCoords1p,
 					   LLStrider<U16> &indicesp,
-					   U32 &index_offset);
+					   U32 &index_offset,
+                       bool pbr);
 	void updateNorthGeometry(LLFace *facep,
 					   LLStrider<LLVector3> &verticesp,
 					   LLStrider<LLVector3> &normalsp,
 					   LLStrider<LLVector2> &texCoords0p,
 					   LLStrider<LLVector2> &texCoords1p,
 					   LLStrider<U16> &indicesp,
-					   U32 &index_offset);
+					   U32 &index_offset,
+                       bool pbr);
 	void updateEastGeometry(LLFace *facep,
 					   LLStrider<LLVector3> &verticesp,
 					   LLStrider<LLVector3> &normalsp,
 					   LLStrider<LLVector2> &texCoords0p,
 					   LLStrider<LLVector2> &texCoords1p,
 					   LLStrider<U16> &indicesp,
-					   U32 &index_offset);
+					   U32 &index_offset,
+                       bool pbr);
 };
 
 #endif // LL_VOSURFACEPATCH_H