st/program: use nir_lower_clip_disable instead of nir_lower_clip_vs conditionally

[mesa.git] / src / mesa / swrast / s_chan.h

diff --git a/src/mesa/swrast/s_chan.h b/src/mesa/swrast/s_chan.h
index 38daf657573bd11116f65518cfa006428e3e12ae..fa6c962b14cbeda713b6cd2122c5a4f1afb92e49 100644 (file)
--- a/src/mesa/swrast/s_chan.h
+++ b/src/mesa/swrast/s_chan.h
@@ -94,8 +94,8 @@
 #elif CHAN_BITS == 32
 
 #define CHAN_TO_UBYTE(c)  FLOAT_TO_UBYTE(c)
-#define CHAN_TO_USHORT(c) ((GLushort) (CLAMP((c), 0.0f, 1.0f) * 65535.0))
-#define CHAN_TO_SHORT(c)  ((GLshort) (CLAMP((c), 0.0f, 1.0f) * 32767.0))
+#define CHAN_TO_USHORT(c) ((GLushort) (SATURATE((c)) * 65535.0))
+#define CHAN_TO_SHORT(c)  ((GLshort) (SATURATE((c)) * 32767.0))
 #define CHAN_TO_FLOAT(c)  (c)
 
 #define CLAMPED_FLOAT_TO_CHAN(c, f)  c = (f)