diff options
| author | Alyssa Rosenzweig <[email protected]> | 2020-05-19 11:09:02 -0400 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-26 22:31:31 +0000 |
| commit | 747cb95e3c832ca33b848b56af458948ff0cce36 (patch) | |
| tree | 154ed06fa10822b4c0919dfd714b97a8aa59cea6 /src | |
| parent | 05bacdb9170edc408a86ca315f195b9aabdd3651 (diff) | |
mesa/swrast: Use SATURATE
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5100>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/swrast/s_chan.h | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_copypix.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_chan.h b/src/mesa/swrast/s_chan.h index 38daf657573..fa6c962b14c 100644 --- 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) diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index fc378a657f7..d6ba44194bd 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -214,7 +214,7 @@ scale_and_bias_z(struct gl_context *ctx, GLuint width, const GLdouble depthMaxF = ctx->DrawBuffer->_DepthMaxF; for (i = 0; i < width; i++) { GLdouble d = depth[i] * ctx->Pixel.DepthScale + ctx->Pixel.DepthBias; - d = CLAMP(d, 0.0, 1.0) * depthMaxF; + d = SATURATE(d) * depthMaxF; if (d >= depthMaxF) z[i] = depthMax; else |