Import Mesa 20.1.6

1 files changed, 33 insertions, 2 deletions

diff --git a/lib/mesa/src/util/half_float.h b/lib/mesa/src/util/half_float.h
index 015574247..c9fad9a94 100644
--- a/lib/mesa/src/util/half_float.h
+++ b/lib/mesa/src/util/half_float.h
@@ -2,6 +2,7 @@
  * Mesa 3-D graphics library
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2018-2019 Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,14 +33,28 @@
 extern "C" {
 #endif
 
-#define FP16_ONE     0x3C00
-#define FP16_ZERO    0
+#define FP16_ONE     ((uint16_t) 0x3c00)
+#define FP16_ZERO    ((uint16_t) 0)
 
 uint16_t _mesa_float_to_half(float val);
 float _mesa_half_to_float(uint16_t val);
 uint8_t _mesa_half_to_unorm8(uint16_t v);
 uint16_t _mesa_uint16_div_64k_to_half(uint16_t v);
 
+/*
+ * _mesa_float_to_float16_rtz is no more than a wrapper to the counterpart
+ * softfloat.h call. Still, softfloat.h conversion API is meant to be kept
+ * private. In other words, only use the API published here, instead of
+ * calling directly the softfloat.h one.
+ */
+uint16_t _mesa_float_to_float16_rtz(float val);
+
+static inline uint16_t
+_mesa_float_to_float16_rtne(float val)
+{
+   return _mesa_float_to_half(val);
+}
+
 static inline bool
 _mesa_half_is_negative(uint16_t h)
 {
@@ -48,6 +63,22 @@ _mesa_half_is_negative(uint16_t h)
 
 
 #ifdef __cplusplus
+
+/* Helper class for disambiguating fp16 from uint16_t in C++ overloads */
+
+struct float16_t {
+   uint16_t bits;
+   float16_t(float f) : bits(_mesa_float_to_half(f)) {}
+   float16_t(double d) : bits(_mesa_float_to_half(d)) {}
+   float16_t(uint16_t bits) : bits(bits) {}
+   static float16_t one() { return float16_t(FP16_ONE); }
+   static float16_t zero() { return float16_t(FP16_ZERO); }
+};
+
+#endif
+
+
+#ifdef __cplusplus
 } /* extern C */
 #endif