From e9329b02a97799dbb2b35b60d5094b106ccdcef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvar=20O=CC=88rn=20Unn=C3=BEo=CC=81rsson?= Date: Thu, 30 Apr 2020 13:51:18 +0200 Subject: [PATCH] Reverting PR #261 --- .../Shaders/Nature/SpeedTree7BillboardPasses.hlsl | 3 --- .../Shaders/Nature/SpeedTree7Passes.hlsl | 3 --- .../Shaders/Nature/SpeedTree8Passes.hlsl | 4 ---- 3 files changed, 10 deletions(-) diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl index 82a5db75c95..49e4e282665 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7BillboardPasses.hlsl @@ -32,10 +32,7 @@ void InitializeData(inout SpeedTreeVertexInput input, out half2 outUV, out half #ifdef ENABLE_WIND if (_WindQuality * _WindEnabled > 0) { - // Disabling "pow(f,e) will not work for negative f"; warnings. - #pragma warning (disable : 3571) billboardPos = GlobalWind(billboardPos, worldPos, true, _ST_WindVector.xyz, input.texcoord1.w); - #pragma warning (enable : 3571) } #endif diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7Passes.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7Passes.hlsl index 199cde43ab6..1f22e5fba7d 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7Passes.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree7Passes.hlsl @@ -90,10 +90,7 @@ void InitializeData(inout SpeedTreeVertexInput input, float lodValue) // global wind if (windQuality > WIND_QUALITY_NONE) { - // Disabling "pow(f,e) will not work for negative f"; warnings. - #pragma warning (disable : 3571) finalPosition = GlobalWind(finalPosition, treePos, true, rotatedWindVector, _ST_WindGlobal.x); - #pragma warning (enable : 3571) } #endif diff --git a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl index 05a4ebb8c9c..ed7776527c8 100644 --- a/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/Nature/SpeedTree8Passes.hlsl @@ -147,11 +147,7 @@ void InitializeData(inout SpeedTreeVertexInput input, float lodValue) globalWindTime += UNITY_ACCESS_INSTANCED_PROP(STWind, _GlobalWindTime); #endif - // Disabling "pow(f,e) will not work for negative f"; warnings. - #pragma warning (disable : 3571) windyPosition = GlobalWind(windyPosition, treePos, true, rotatedWindVector, globalWindTime); - #pragma warning (enable : 3571) - input.vertex.xyz = windyPosition; } #endif