template specialization

Author: kmpeng

clang/lib/Headers/hlsl.h

@@ -22,10 +22,10 @@
 
 // HLSL standard library function declarations/definitions.
 #include "hlsl/hlsl_alias_intrinsics.h"
-#include "hlsl/hlsl_intrinsics.h"
 #if __HLSL_VERSION <= __HLSL_202x
 #include "hlsl/hlsl_compat_overloads.h"
 #endif
+#include "hlsl/hlsl_intrinsics.h"
 
 #if defined(__clang__)
 #pragma clang diagnostic pop

clang/lib/Headers/hlsl/hlsl_compat_overloads.h

@@ -285,12 +285,10 @@ _DXC_COMPAT_TERNARY_INTEGER_OVERLOADS(lerp)
 //===----------------------------------------------------------------------===//
 
 template <typename T>
-constexpr __detail::enable_if_t<__detail::is_arithmetic<T>::Value &&
-                                    !__detail::is_same<half, T>::value &&
-                                    !__detail::is_same<float, T>::value,
-                                vector<T, 4>>
+const inline __detail::enable_if_t<__detail::is_arithmetic<T>::Value,
+                                   vector<T, 4>>
 lit(T NDotL, T NDotH, T M) {
-  return lit((float)NDotL, (float)NDotH, (float)M);
+  return lit<float>((float)NDotL, (float)NDotH, (float)M);
 }
 
 //===----------------------------------------------------------------------===//

clang/lib/Headers/hlsl/hlsl_intrinsics.h

@@ -268,19 +268,14 @@ const inline float length(__detail::HLSL_FIXED_VECTOR<float, N> X) {
 /// This function returns a lighting coefficient vector (ambient, diffuse,
 /// specular, 1).
 
-template <typename T>
+template <>
 _HLSL_16BIT_AVAILABILITY(shadermodel, 6.2)
-const inline __detail::enable_if_t<__detail::is_arithmetic<T>::Value &&
-                                       __detail::is_same<half, T>::value,
-                                   vector<T, 4>> lit(T NDotL, T NDotH, T M) {
+const inline vector<half, 4> lit<half>(half NDotL, half NDotH, half M) {
   return __detail::lit_impl(NDotL, NDotH, M);
 }
 
-template <typename T>
-const inline __detail::enable_if_t<__detail::is_arithmetic<T>::Value &&
-                                       __detail::is_same<float, T>::value,
-                                   vector<T, 4>>
-lit(T NDotL, T NDotH, T M) {
+template <>
+const inline vector<float, 4> lit<float>(float NDotL, float NDotH, float M) {
   return __detail::lit_impl(NDotL, NDotH, M);
 }
 

clang/test/SemaHLSL/BuiltIns/lit-errors.hlsl

@@ -3,39 +3,29 @@
 float4 test_no_second_arg(float p0) {
   return lit(p0);
   // expected-error@-1 {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires 3 arguments, but 1 was provided}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires 3 arguments, but 1 was provided}}
   // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate function template not viable: requires 3 arguments, but 1 was provided}}
 }
 
 float4 test_no_third_arg(float p0) {
   return lit(p0, p0);
   // expected-error@-1 {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires 3 arguments, but 2 were provided}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires 3 arguments, but 2 were provided}}
   // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate function template not viable: requires 3 arguments, but 2 were provided}}
 }
 
 float4 test_too_many_arg(float p0) {
   return lit(p0, p0, p0, p0);
   // expected-error@-1 {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires 3 arguments, but 4 were provided}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires 3 arguments, but 4 were provided}}
   // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate function template not viable: requires 3 arguments, but 4 were provided}}
 }
 
 float4 test_vec_inputs(float2 p0, float2 p1, float2 p2) {
   return lit(p0, p1, p2);
   // expected-error@-1  {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored: substitution failure [with T = float2]: invalid vector element type 'vector<float, 2>' (vector of 2 'float' values)}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored: substitution failure [with T = float2]: invalid vector element type 'vector<float, 2>' (vector of 2 'float' values)}}
   // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate template ignored: substitution failure [with T = float2]: invalid vector element type 'vector<float, 2>' (vector of 2 'float' values)}}
 }
 
 float4 test_vec1_inputs(float1 p0, float1 p1, float1 p2) {
   return lit(p0, p1, p2);
   // expected-error@-1  {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored: substitution failure [with T = float1]: invalid vector element type 'vector<float, 1>' (vector of 1 'float' value)}}
-  // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored: substitution failure [with T = float1]: invalid vector element type 'vector<float, 1>' (vector of 1 'float' value)}}
   // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate template ignored: substitution failure [with T = float1]: invalid vector element type 'vector<float, 1>' (vector of 1 'float' value)}}
 }