remove ^M chars, disable shading language extensions

[mesa.git] / src / mesa / main / imports.h

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 86480c82b1d8dcd8b3eba14b0496cc87829854d0..11b0eebf12905a1130e15ef67ab7dfa92bee676b 100644 (file)
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -88,8 +88,6 @@ extern "C" {
 /** Set \p N bytes in \p DST to \p VAL */
 #define MEMSET( DST, VAL, N )      _mesa_memset(DST, VAL, N)
 
-#define MEMSET16( DST, VAL, N )   _mesa_memset16( (DST), (VAL), (size_t) (N) )
-
 /*@}*/
 
 
@@ -100,7 +98,7 @@ extern "C" {
  * this macro.
  * Both pointers/offsets are expressed in bytes.
  */
-#define ADD_POINTERS(A, B)  ( (A) + (unsigned long) (B) )
+#define ADD_POINTERS(A, B)  ( (GLubyte *) (A) + (uintptr_t) (B) )
 
 
 /**********************************************************************/
@@ -160,42 +158,15 @@ extern "C" {
 /*@}*/
 
 
-/**********************************************************************/
-/** \name External pixel buffer allocation.
- *
- * If you want Mesa's depth/stencil/accum/etc buffers to be allocated with a
- * specialized allocator you can define MESA_EXTERNAL_BUFFERALLOC and implement
- * _ext_mesa_alloc_pixelbuffer() _ext_mesa_free_pixelbuffer() in your
- * application.
- *
- * \author
- * Contributed by Gerk Huisma (gerk@five-d.demon.nl).
- */
-/*@{*/
-
-/**
- * \def MESA_PBUFFER_ALLOC
- * Allocate a pixel buffer.
- */
-
 /**
- * \def MESA_PBUFFER_FREE
- * Free a pixel buffer.
+ * Sometimes we treat GLfloats as GLints.  On x86 systems, moving a float
+ * as a int (thereby using integer registers instead of FP registers) is
+ * a performance win.  Typically, this can be done with ordinary casts.
+ * But with gcc's -fstrict-aliasing flag (which defaults to on in gcc 3.0)
+ * these casts generate warnings.
+ * The following union typedef is used to solve that.
  */
-
-#ifdef MESA_EXTERNAL_BUFFERALLOC
-extern void *_ext_mesa_alloc_pixelbuffer( unsigned int size );
-extern void _ext_mesa_free_pixelbuffer( void *pb );
-
-#define MESA_PBUFFER_ALLOC(BYTES)  (void *) _ext_mesa_alloc_pixelbuffer(BYTES)
-#define MESA_PBUFFER_FREE(PTR)     _ext_mesa_free_pixelbuffer(PTR)
-#else
-/* Default buffer allocation uses the aligned allocation routines: */
-#define MESA_PBUFFER_ALLOC(BYTES)  (void *) _mesa_align_malloc(BYTES, 512)
-#define MESA_PBUFFER_FREE(PTR)     _mesa_align_free(PTR)
-#endif
-
-/*@}*/
+typedef union { GLfloat f; GLint i; } fi_type;
 
 
 
@@ -210,6 +181,11 @@ extern void _ext_mesa_free_pixelbuffer( void *pb );
 #define M_PI (3.1415926536)
 #endif
 
+#ifndef M_E
+#define M_E (2.7182818284590452354)
+#endif
+
+
 /* XXX this is a bit of a hack needed for compilation within XFree86 */
 #ifndef FLT_MIN
 #define FLT_MIN (1.0e-37)
@@ -326,8 +302,13 @@ static INLINE int IS_INF_OR_NAN( float x )
  *** IS_NEGATIVE: test if float is negative
  ***/
 #if defined(USE_IEEE)
-#define GET_FLOAT_BITS(x) ((fi_type *) &(x))->i
-#define IS_NEGATIVE(x) (GET_FLOAT_BITS(x) & (1<<31))
+static INLINE int GET_FLOAT_BITS( float x )
+{
+   fi_type fi;
+   fi.f = x;
+   return fi.i;
+}
+#define IS_NEGATIVE(x) (GET_FLOAT_BITS(x) < 0)
 #else
 #define IS_NEGATIVE(x) (x < 0.0F)
 #endif
@@ -355,15 +336,18 @@ static INLINE int IS_INF_OR_NAN( float x )
 #define CEILF(x)   ((GLfloat) xf86ceil(x))
 #define FLOORF(x)  ((GLfloat) xf86floor(x))
 #define FABSF(x)   ((GLfloat) xf86fabs(x))
+#define LDEXPF(x,y)   ((GLfloat) xf86ldexp(x,y))
 #elif defined(__gnu_linux__)
 /* C99 functions */
 #define CEILF(x)   ceilf(x)
 #define FLOORF(x)  floorf(x)
 #define FABSF(x)   fabsf(x)
+#define LDEXPF(x,y)  ldexpf(x,y)
 #else
 #define CEILF(x)   ((GLfloat) ceil(x))
 #define FLOORF(x)  ((GLfloat) floor(x))
 #define FABSF(x)   ((GLfloat) fabs(x))
+#define LDEXPF(x,y)  ((GLfloat) ldexp(x,y))
 #endif
 
 
@@ -553,14 +537,9 @@ static INLINE int iceil(float f)
 
 
 /***
- *** COPY_FLOAT: copy a float from src to dest, avoid slow FP regs if possible
+ *** COPY_FLOAT: copy a float from src to dest.
  ***/
-#if defined(USE_IEEE) && !defined(DEBUG)
-#define COPY_FLOAT( dst, src )                                 \
-       ((fi_type *) &(dst))->i = ((fi_type *) (void *) &(src))->i
-#else
 #define COPY_FLOAT( dst, src )         (dst) = (src)
-#endif
 
 
 /***