diff options
| author | Vinson Lee <vlee@vmware.com> | 2010-07-09 15:06:19 -0700 |
|---|---|---|
| committer | Vinson Lee <vlee@vmware.com> | 2010-07-09 15:06:19 -0700 |
| commit | 343b38a692a43f091117e05287748d9b2f093aee (patch) | |
| tree | 886efd59d93be497c76c5906d39310eb739fa1eb /src/mesa/main/imports.h | |
| parent | 347c00c46e9ecf858a8c21abf58a706b658b5b37 (diff) | |
mesa: Move [UN]CLAMPED_FLOAT_TO_UBYTE from imports.h to macros.h.
The other similar integer/float conversion macros are in macros.h.
Diffstat (limited to 'src/mesa/main/imports.h')
| -rw-r--r-- | src/mesa/main/imports.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index da825a095e..9c2ffd66d6 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -444,42 +444,6 @@ _mesa_next_pow_two_64(uint64_t x) } -/*** - *** UNCLAMPED_FLOAT_TO_UBYTE: clamp float to [0,1] and map to ubyte in [0,255] - *** CLAMPED_FLOAT_TO_UBYTE: map float known to be in [0,1] to ubyte in [0,255] - ***/ -#if defined(USE_IEEE) && !defined(DEBUG) -#define IEEE_0996 0x3f7f0000 /* 0.996 or so */ -/* This function/macro is sensitive to precision. Test very carefully - * if you change it! - */ -#define UNCLAMPED_FLOAT_TO_UBYTE(UB, F) \ - do { \ - fi_type __tmp; \ - __tmp.f = (F); \ - if (__tmp.i < 0) \ - UB = (GLubyte) 0; \ - else if (__tmp.i >= IEEE_0996) \ - UB = (GLubyte) 255; \ - else { \ - __tmp.f = __tmp.f * (255.0F/256.0F) + 32768.0F; \ - UB = (GLubyte) __tmp.i; \ - } \ - } while (0) -#define CLAMPED_FLOAT_TO_UBYTE(UB, F) \ - do { \ - fi_type __tmp; \ - __tmp.f = (F) * (255.0F/256.0F) + 32768.0F; \ - UB = (GLubyte) __tmp.i; \ - } while (0) -#else -#define UNCLAMPED_FLOAT_TO_UBYTE(ub, f) \ - ub = ((GLubyte) IROUND(CLAMP((f), 0.0F, 1.0F) * 255.0F)) -#define CLAMPED_FLOAT_TO_UBYTE(ub, f) \ - ub = ((GLubyte) IROUND((f) * 255.0F)) -#endif - - /** * Return 1 if this is a little endian machine, 0 if big endian. */ |