summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2023-10-13 10:43:02 -0700
committerCosmic Linden <cosmic@lindenlab.com>2023-10-13 10:43:02 -0700
commitf9bd70efc9ab25dfc1ab0b9aa10d16aec271410b (patch)
treee6774af4167e7710cf5477a37bfd1da95f9a8b5b /indra
parentbe38adebbe46d62bc07d504a70556062f4e55101 (diff)
DRTVWR-592: Fix non-triplanar being slower somehow in some cases.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl22
1 files changed, 2 insertions, 20 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl
index a87927786c..078c753a35 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbrterrainUtilF.glsl
@@ -511,26 +511,8 @@ vec4 terrain_texture_color(sampler2D tex, TerrainCoord terrain_coord)
return col;
}
-PBRMix terrain_sample_pbr(
- TerrainCoord terrain_coord
- , sampler2D tex_col
- , sampler2D tex_orm
- , sampler2D tex_vNt
-#if (TERRAIN_PBR_DETAIL >= TERRAIN_PBR_DETAIL_EMISSIVE)
- , sampler2D tex_emissive
-#endif
- )
-{
- return sample_pbr(
- terrain_coord
- , tex_col
- , tex_orm
- , tex_vNt
-#if (TERRAIN_PBR_DETAIL >= TERRAIN_PBR_DETAIL_EMISSIVE)
- , tex_emissive
-#endif
- );
-}
+#define terrain_sample_pbr sample_pbr
+
#endif
// The goal of _tmix_sample and related functions is to only sample textures when necessary, ignoring if the weights are low.