Emulate tanh on HLSL

src/compiler/translator/OutputHLSL.cpp

@@ -1472,8 +1472,6 @@ bool OutputHLSL::visitUnary(Visit visit, TIntermUnary *node)
             outputTriplet(out, visit, "cosh(", "", ")");
             break;
         case EOpTanh:
-            outputTriplet(out, visit, "tanh(", "", ")");
-            break;
         case EOpAsinh:
         case EOpAcosh:
         case EOpAtanh:

src/compiler/translator/emulated_builtin_function_data_hlsl.json

@@ -1378,5 +1378,48 @@
          "borrow = uint4(x < y);",
          "return x - y;"
       ]
+   },
+   {
+      "comment":[
+         "We emulate tanh just to avoid overflow on large arguments."
+      ],
+      "op":"tanh",
+      "return_type":"float",
+      "args":[
+         "float x"
+      ],
+      "body":[
+         "return (abs(x) > 15.0) ? sign(x) : tanh(x);"
+      ]
+   },
+   {
+      "op":"tanh",
+      "return_type":"float2",
+      "args":[
+         "float2 x"
+      ],
+      "body":[
+         "return (abs(x) > 15.0) ? sign(x) : tanh(x);"
+      ]
+   },
+   {
+      "op":"tanh",
+      "return_type":"float3",
+      "args":[
+         "float3 x"
+      ],
+      "body":[
+         "return (abs(x) > 15.0) ? sign(x) : tanh(x);"
+      ]
+   },
+   {
+      "op":"tanh",
+      "return_type":"float4",
+      "args":[
+         "float4 x"
+      ],
+      "body":[
+         "return (abs(x) > 15.0) ? sign(x) : tanh(x);"
+      ]
    }
 ]

src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp

@@ -840,6 +840,27 @@ constexpr FunctionPair g_hlslFunctions[] = {
      "    borrow = uint4(x < y);\n"
      "    return x - y;\n"
      "}\n"},
+    // We emulate tanh just to avoid overflow on large arguments.
+    {{EOpTanh, ParamType::Float1},
+     "float tanh_emu(float x)\n"
+     "{\n"
+     "    return (abs(x) > 15.0) ? sign(x) : tanh(x);\n"
+     "}\n"},
+    {{EOpTanh, ParamType::Float2},
+     "float2 tanh_emu(float2 x)\n"
+     "{\n"
+     "    return (abs(x) > 15.0) ? sign(x) : tanh(x);\n"
+     "}\n"},
+    {{EOpTanh, ParamType::Float3},
+     "float3 tanh_emu(float3 x)\n"
+     "{\n"
+     "    return (abs(x) > 15.0) ? sign(x) : tanh(x);\n"
+     "}\n"},
+    {{EOpTanh, ParamType::Float4},
+     "float4 tanh_emu(float4 x)\n"
+     "{\n"
+     "    return (abs(x) > 15.0) ? sign(x) : tanh(x);\n"
+     "}\n"},
 };
 }  // anonymous namespace
 

src/tests/deqp_support/deqp_gles3_test_expectations.txt

@@ -108,14 +108,6 @@
 
 // Windows only failure
 
-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_vertex.scalar = FAIL
-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_vertex.vec2 = FAIL
-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_vertex.vec3 = FAIL
-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_vertex.vec4 = FAIL
-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.scalar = FAIL
-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.vec2 = FAIL
-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.vec3 = FAIL
-1093 WIN : dEQP-GLES3.functional.shaders.builtin_functions.precision.tanh.highp_fragment.vec4 = FAIL
 1092 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureoffset.sampler3d_fixed_fragment = FAIL
 1092 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureoffset.sampler3d_float_fragment = FAIL
 1092 WIN : dEQP-GLES3.functional.shaders.texture_functions.textureprojoffset.sampler3d_fixed_fragment = FAIL