DRTVWR-592: Create separate config option for terrain repeats. Clean up debug

7 files changed, 37 insertions, 49 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 94cc5a14a4..2dac0b5d70 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10703,7 +10703,7 @@
     <key>RenderTerrainScale</key>
     <map>
       <key>Comment</key>
-      <string>Terrain detail texture scale</string>
+      <string>Terrain detail texture scale (meters)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -10722,6 +10722,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>RenderTerrainPBRScale</key>
+    <map>
+      <key>Comment</key>
+      <string>PBR terrain detail texture scale (meters)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>4.0</real>
+    </map>
     <key>RenderTrackerBeacon</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
index 5f94855963..e6261ca85e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
@@ -70,7 +70,6 @@ vec2 encode_normal(vec3 n);
 vec3 linear_to_srgb(vec3 c);
 vec3 srgb_to_linear(vec3 c);
 
-in vec4 debug_pos; // TODO: Remove
 // *TODO: This mixing function feels like it can be optimized. The terrain code's use of texcoord1 is dubious. It feels like the same thing can be accomplished with less memory bandwidth by calculating the offsets on-the-fly
 float terrain_mix(vec4 samples, float alpha1, float alpha2, float alphaFinal)
 {
@@ -150,7 +149,6 @@ vec3 sample_and_mix_vector3_no_scale(float alpha1, float alpha2, float alphaFina
 void main()
 {
     vec2 terrain_texcoord = vary_texcoord0.xy;
-    terrain_texcoord -= vec2(21.0);// TODO: Remove
     float alpha1 = texture(alpha_ramp, vary_texcoord0.zw).a;
     float alpha2 = texture(alpha_ramp,vary_texcoord1.xy).a;
     float alphaFinal = texture(alpha_ramp, vary_texcoord1.zw).a;
@@ -162,25 +160,6 @@ void main()
         discard;
     }
 
-    // TODO: Remove all of this
-    float debug_pos_x = debug_pos.x;
-    //float debug_pos_x = terrain_texcoord.y;
-    float debug_metric = debug_pos_x;
-    debug_metric = debug_metric - floor(debug_metric);
-    debug_metric *= debug_metric;
-    float debug_metric2 = debug_pos_x / 4.0;
-    debug_metric2 = debug_metric2 - floor(debug_metric2);
-    debug_metric2 *= debug_metric2;
-    debug_metric2 *= debug_metric2;
-    debug_metric2 *= 16.0;
-    float debug_metric3 = debug_pos_x / 16.0;
-    debug_metric3 = debug_metric3 - floor(debug_metric3);
-    debug_metric3 *= debug_metric3;
-    debug_metric3 *= debug_metric3;
-    debug_metric3 *= debug_metric3;
-    debug_metric3 *= 16.0;
-    //col.xyz = vec3(debug_metric3, debug_metric2, debug_metric);// TODO: Remove
-
     vec3 normal_texture = sample_and_mix_vector3_no_scale(alpha1, alpha2, alphaFinal, terrain_texcoord, detail_0_normal, detail_1_normal, detail_2_normal, detail_3_normal);
 
     vec3[4] orm_factors;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainV.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainV.glsl
index fd80d1bb2c..1653cc1a90 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainV.glsl
@@ -52,18 +52,15 @@ vec4 texgen_object_pbr(vec4 tc, mat4 mat, vec4 tp0, vec4 tp1)
     tcoord.z = tcoord.z;
     tcoord.w = tcoord.w;
     
-    tcoord = mat * tcoord; 
+    tcoord = mat * tcoord;
     
     return tcoord;
 }
 
-out vec4 debug_pos; // TODO: Remove
-
 void main()
 {
     //transform vertex
 	gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); 
-	debug_pos = vec4(texcoord0, 0.0, 1.0); 
 
 	vec3 n = normal_matrix * normal;
 	vec3 t = normal_matrix * tangent.xyz;
@@ -71,15 +68,10 @@ void main()
     vary_tangent = normalize(t);
     vary_sign = tangent.w;
     vary_normal = normalize(n);
-    
+
     // Transform and pass tex coords
     // *NOTE: KHR texture transform is ignored for now
     vary_texcoord0.xy = texgen_object_pbr(vec4(texcoord0, 0, 1), texture_matrix0, object_plane_s, object_plane_t).xy;
-    // Adjust the texture repeats for a more sensible default.
-    // *TODO: Remove this extra factor when KHR texture transform is added
-    float texture_density_factor = 3.0;
-    //texture_density_factor /= 256.0; // TODO: Remove
-    vary_texcoord0.xy *= texture_density_factor;
     
     vec4 tc = vec4(texcoord1,0,1);
     
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp
index b4671963e1..85b4bb3dca 100644
--- a/indra/newview/lldrawpoolterrain.cpp
+++ b/indra/newview/lldrawpoolterrain.cpp
@@ -59,6 +59,7 @@ const S32 PBR_DETAIL_EMISSIVE = 0;
 S32 LLDrawPoolTerrain::sDetailMode = 1;
 S32 LLDrawPoolTerrain::sPBRDetailMode = 0;
 F32 LLDrawPoolTerrain::sDetailScale = DETAIL_SCALE;
+F32 LLDrawPoolTerrain::sPBRDetailScale = DETAIL_SCALE;
 static LLGLSLShader* sShader = NULL;
 static LLTrace::BlockTimerStatHandle FTM_SHADOW_TERRAIN("Terrain Shadow");
 
@@ -69,6 +70,7 @@ LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerTexture *texturep) :
 {
 	// Hack!
 	sDetailScale = 1.f/gSavedSettings.getF32("RenderTerrainScale");
+	sPBRDetailScale = 1.f/gSavedSettings.getF32("RenderTerrainPBRScale");
     // TODO: This is unused. Remove?
 	sDetailMode = gSavedSettings.getS32("RenderTerrainDetail");
 	sPBRDetailMode = gSavedSettings.getS32("RenderTerrainPBRDetail");
@@ -385,16 +387,15 @@ void LLDrawPoolTerrain::renderFullShaderPBR(BOOL local_materials)
         materials = &gLocalTerrainMaterials.mDetailMaterials;
     }
 
-    // *TODO: I'm seeing terrain still jump when switching regions. Might have something to do with the extra repeat factor in the shader. Or is it a numerical precision issue?...
-    // *TODO: If we want to change the tiling, we should change this offset modulo to prevent seams
+    // *TODO: Figure out why this offset is *sometimes* producing seams at the region edge, and repeat jumps when crossing regions, when RenderTerrainPBRScale is not a factor of the region scale.
 	LLVector3d region_origin_global = gAgent.getRegion()->getOriginGlobal();
-	F32 offset_x = (F32)fmod(region_origin_global.mdV[VX], 1.0/(F64)sDetailScale)*sDetailScale;
-	F32 offset_y = (F32)fmod(region_origin_global.mdV[VY], 1.0/(F64)sDetailScale)*sDetailScale;
+	F32 offset_x = (F32)fmod(region_origin_global.mdV[VX], 1.0/(F64)sPBRDetailScale)*sPBRDetailScale;
+	F32 offset_y = (F32)fmod(region_origin_global.mdV[VY], 1.0/(F64)sPBRDetailScale)*sPBRDetailScale;
 
 	LLVector4 tp0, tp1;
 	
-	tp0.setVec(sDetailScale, 0.0f, 0.0f, offset_x);
-	tp1.setVec(0.0f, sDetailScale, 0.0f, offset_y);
+	tp0.setVec(sPBRDetailScale, 0.0f, 0.0f, offset_x);
+	tp1.setVec(0.0f, sPBRDetailScale, 0.0f, offset_y);
 
     constexpr U32 terrain_material_count = 1 + LLViewerShaderMgr::TERRAIN_DETAIL3_BASE_COLOR - LLViewerShaderMgr::TERRAIN_DETAIL0_BASE_COLOR;
     S32 detail_basecolor[terrain_material_count];
diff --git a/indra/newview/lldrawpoolterrain.h b/indra/newview/lldrawpoolterrain.h
index 060354458d..99d192da86 100644
--- a/indra/newview/lldrawpoolterrain.h
+++ b/indra/newview/lldrawpoolterrain.h
@@ -68,7 +68,8 @@ public:
 
 	static S32 sDetailMode;
 	static S32 sPBRDetailMode;
-	static F32 sDetailScale; // meters per texture
+	static F32 sDetailScale; // textures per meter
+	static F32 sPBRDetailScale; // textures per meter
 
 protected:
     void boostTerrainDetailTextures();
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp
index 4f9911a11c..5bc220fcbd 100644
--- a/indra/newview/llsurfacepatch.cpp
+++ b/indra/newview/llsurfacepatch.cpp
@@ -209,15 +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 operation is being applied too early because it also affects the geometry - we only want to affect the UVs
-    // TODO: Figure out what correct scaling is needed to prevent seams at region borders - getPatchesPerEdge seems to not be the solution, nor is getGridsPerEdge on its own
 	U32 surface_stride = mSurfacep->getGridsPerEdge();
-	U32 texture_stride = mSurfacep->getGridsPerEdge() - 1;
-    if (!pbr)
-    {
-        // TODO: Re-enable legacy repeats
-        //texture_stride = mSurfacep->getGridsPerEdge();
-    }
 	U32 point_offset = x + y*surface_stride;
 
 	*normal = getNormal(x, y);
@@ -229,8 +221,9 @@ void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3
 	*vertex     = pos_agent-mVObjp->getRegion()->getOriginAgent();
 
 	LLVector3 rel_pos = pos_agent - mSurfacep->getOriginAgent();
-	// TODO: Revert for non-PBR only here, and/or add note that non-PBR doesn't actually use it.
-	LLVector3 tex_pos = rel_pos * (1.f/(texture_stride * mSurfacep->getMetersPerGrid()));
+	// *NOTE: Only PBR terrain uses the UVs right now. Texture terrain just ignores it.
+    // *NOTE: In the future, UVs and horizontal position will no longer have a 1:1 relationship for PBR terrain
+	LLVector3 tex_pos = rel_pos;
 	tex0->mV[0]  = tex_pos.mV[0];
 	tex0->mV[1]  = tex_pos.mV[1];
 	tex1->mV[0] = mSurfacep->getRegion()->getCompositionXY(llfloor(mOriginRegion.mV[0])+x, llfloor(mOriginRegion.mV[1])+y);
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index baf5480c6a..8ee675820c 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -134,6 +134,16 @@ static bool handleTerrainScaleChanged(const LLSD& newvalue)
 	return true;
 }
 
+static bool handlePBRTerrainScaleChanged(const LLSD& newvalue)
+{
+    F64 scale = newvalue.asReal();
+    if (scale != 0.0)
+    {
+        LLDrawPoolTerrain::sPBRDetailScale = F32(1.0 / scale);
+    }
+	return true;
+}
+
 static bool handleDebugAvatarJointsChanged(const LLSD& newvalue)
 {
     std::string new_string = newvalue.asString();
@@ -712,6 +722,7 @@ void settings_setup_listeners()
     setting_setup_signal_listener(gSavedSettings, "RenderFarClip", handleRenderFarClipChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderTerrainDetail", handleTerrainDetailChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderTerrainScale", handleTerrainScaleChanged);
+    setting_setup_signal_listener(gSavedSettings, "RenderTerrainPBRScale", handlePBRTerrainScaleChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderTerrainPBRDetail", handleSetShaderChanged);
     setting_setup_signal_listener(gSavedSettings, "OctreeStaticObjectSizeFactor", handleRepartition);
     setting_setup_signal_listener(gSavedSettings, "OctreeDistanceFactor", handleRepartition);