summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred/pbrterrainV.glsl
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/pbrterrainV.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/pbrterrainV.glsl12
1 files changed, 2 insertions, 10 deletions
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);