mesa: move a bunch of compiler-related stuff into new compiler.h header
This trims down and cleans up imports.h and glheader.h quite a bit.
This commit is contained in:
parent
d909dbcc43
commit
f2c023291a
|
@ -35,6 +35,7 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "main/glheader.h"
|
#include "main/glheader.h"
|
||||||
|
#include "main/compiler.h"
|
||||||
#include "glapi/glapi.h"
|
#include "glapi/glapi.h"
|
||||||
#include "glxapi.h"
|
#include "glxapi.h"
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,7 @@ class PrintGlEnums(gl_XML.gl_print_base):
|
||||||
|
|
||||||
def printRealHeader(self):
|
def printRealHeader(self):
|
||||||
print '#include "glheader.h"'
|
print '#include "glheader.h"'
|
||||||
|
print '#include "mfeatures.h"'
|
||||||
print '#include "enums.h"'
|
print '#include "enums.h"'
|
||||||
print '#include "imports.h"'
|
print '#include "imports.h"'
|
||||||
print ''
|
print ''
|
||||||
|
@ -55,8 +56,6 @@ class PrintGlEnums(gl_XML.gl_print_base):
|
||||||
|
|
||||||
def print_code(self):
|
def print_code(self):
|
||||||
print """
|
print """
|
||||||
#define Elements(x) sizeof(x)/sizeof(*x)
|
|
||||||
|
|
||||||
typedef int (*cfunc)(const void *, const void *);
|
typedef int (*cfunc)(const void *, const void *);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -61,6 +61,8 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "main/compiler.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "main/glheader.h"
|
#include "main/glheader.h"
|
||||||
|
#include "main/compiler.h"
|
||||||
#include "glapi.h"
|
#include "glapi.h"
|
||||||
#include "glapioffsets.h"
|
#include "glapioffsets.h"
|
||||||
#include "glapitable.h"
|
#include "glapitable.h"
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "main/glheader.h"
|
#include "main/compiler.h"
|
||||||
#include "glthread.h"
|
#include "glthread.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "glheader.h"
|
#include "mfeatures.h"
|
||||||
#if FEATURE_accum
|
#if FEATURE_accum
|
||||||
#include "accum.h"
|
#include "accum.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -0,0 +1,479 @@
|
||||||
|
/*
|
||||||
|
* Mesa 3-D graphics library
|
||||||
|
* Version: 7.5
|
||||||
|
*
|
||||||
|
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
|
||||||
|
* Copyright (C) 2009 VMware, Inc. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included
|
||||||
|
* in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \file compiler.h
|
||||||
|
* Compiler-related stuff.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef COMPILER_H
|
||||||
|
#define COMPILER_H
|
||||||
|
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#if defined(__alpha__) && defined(CCPML)
|
||||||
|
#include <cpml.h> /* use Compaq's Fast Math Library on Alpha */
|
||||||
|
#else
|
||||||
|
#include <math.h>
|
||||||
|
#endif
|
||||||
|
#include <limits.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#if defined(__linux__) && defined(__i386__)
|
||||||
|
#include <fpu_control.h>
|
||||||
|
#endif
|
||||||
|
#include <float.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get standard integer types
|
||||||
|
*/
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
typedef __int8 int8_t;
|
||||||
|
typedef unsigned __int8 uint8_t;
|
||||||
|
typedef __int16 int16_t;
|
||||||
|
typedef unsigned __int16 uint16_t;
|
||||||
|
# ifndef __eglplatform_h_
|
||||||
|
typedef __int32 int32_t;
|
||||||
|
# endif
|
||||||
|
typedef unsigned __int32 uint32_t;
|
||||||
|
typedef __int64 int64_t;
|
||||||
|
typedef unsigned __int64 uint64_t;
|
||||||
|
|
||||||
|
# if defined(_WIN64)
|
||||||
|
typedef __int64 intptr_t;
|
||||||
|
typedef unsigned __int64 uintptr_t;
|
||||||
|
# else
|
||||||
|
typedef __int32 intptr_t;
|
||||||
|
typedef unsigned __int32 uintptr_t;
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# define INT64_C(__val) __val##i64
|
||||||
|
# define UINT64_C(__val) __val##ui64
|
||||||
|
#else
|
||||||
|
# include <stdint.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sun compilers define __i386 instead of the gcc-style __i386__
|
||||||
|
*/
|
||||||
|
#ifdef __SUNPRO_C
|
||||||
|
# if !defined(__i386__) && defined(__i386)
|
||||||
|
# define __i386__
|
||||||
|
# elif !defined(__amd64__) && defined(__amd64)
|
||||||
|
# define __amd64__
|
||||||
|
# elif !defined(__sparc__) && defined(__sparc)
|
||||||
|
# define __sparc__
|
||||||
|
# endif
|
||||||
|
# if !defined(__volatile)
|
||||||
|
# define __volatile volatile
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* finite macro.
|
||||||
|
*/
|
||||||
|
#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
|
||||||
|
# define __WIN32__
|
||||||
|
# define finite _finite
|
||||||
|
#endif
|
||||||
|
#if defined(__WATCOMC__)
|
||||||
|
# define finite _finite
|
||||||
|
# pragma disable_message(201) /* Disable unreachable code warnings */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disable assorted warnings
|
||||||
|
*/
|
||||||
|
#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
|
||||||
|
# if !defined(__GNUC__) /* mingw environment */
|
||||||
|
# pragma warning( disable : 4068 ) /* unknown pragma */
|
||||||
|
# pragma warning( disable : 4710 ) /* function 'foo' not inlined */
|
||||||
|
# pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
|
||||||
|
# pragma warning( disable : 4127 ) /* conditional expression is constant */
|
||||||
|
# if defined(MESA_MINWARN)
|
||||||
|
# pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
|
||||||
|
# pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
|
||||||
|
# pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
|
||||||
|
# pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
|
||||||
|
# pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function inlining
|
||||||
|
*/
|
||||||
|
#if defined(__GNUC__)
|
||||||
|
# define INLINE __inline__
|
||||||
|
#elif defined(__MSC__)
|
||||||
|
# define INLINE __inline
|
||||||
|
#elif defined(_MSC_VER)
|
||||||
|
# define INLINE __inline
|
||||||
|
#elif defined(__ICL)
|
||||||
|
# define INLINE __inline
|
||||||
|
#elif defined(__INTEL_COMPILER)
|
||||||
|
# define INLINE inline
|
||||||
|
#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
|
||||||
|
# define INLINE __inline
|
||||||
|
#elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
|
||||||
|
# define INLINE inline
|
||||||
|
# define __inline inline
|
||||||
|
# define __inline__ inline
|
||||||
|
#elif (__STDC_VERSION__ >= 199901L) /* C99 */
|
||||||
|
# define INLINE inline
|
||||||
|
#else
|
||||||
|
# define INLINE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PUBLIC/USED macros
|
||||||
|
*
|
||||||
|
* If we build the library with gcc's -fvisibility=hidden flag, we'll
|
||||||
|
* use the PUBLIC macro to mark functions that are to be exported.
|
||||||
|
*
|
||||||
|
* We also need to define a USED attribute, so the optimizer doesn't
|
||||||
|
* inline a static function that we later use in an alias. - ajax
|
||||||
|
*/
|
||||||
|
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
|
||||||
|
# define PUBLIC __attribute__((visibility("default")))
|
||||||
|
# define USED __attribute__((used))
|
||||||
|
#else
|
||||||
|
# define PUBLIC
|
||||||
|
# define USED
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Some compilers don't like some of Mesa's const usage. In those places use
|
||||||
|
* CONST instead of const. Pass -DNO_CONST to compilers where this matters.
|
||||||
|
*/
|
||||||
|
#ifdef NO_CONST
|
||||||
|
# define CONST
|
||||||
|
#else
|
||||||
|
# define CONST const
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* __builtin_expect macros
|
||||||
|
*/
|
||||||
|
#if (!defined(__GNUC__) || __GNUC__ < 3) && (!defined(__IBMC__) || __IBMC__ < 900)
|
||||||
|
# define __builtin_expect(x, y) x
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The __FUNCTION__ gcc variable is generally only used for debugging.
|
||||||
|
* If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
|
||||||
|
* Don't define it if using a newer Windows compiler.
|
||||||
|
*/
|
||||||
|
#ifndef __FUNCTION__
|
||||||
|
# if defined(__VMS)
|
||||||
|
# define __FUNCTION__ "VMS$NL:"
|
||||||
|
# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
|
||||||
|
(!defined(_MSC_VER) || _MSC_VER < 1300)
|
||||||
|
# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
|
||||||
|
(defined(__SUNPRO_C) && defined(__C99FEATURES__))
|
||||||
|
# define __FUNCTION__ __func__
|
||||||
|
# else
|
||||||
|
# define __FUNCTION__ "<unknown>"
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN.
|
||||||
|
* Do not use them unless absolutely necessary!
|
||||||
|
* Try to use a runtime test instead.
|
||||||
|
* For now, only used by some DRI hardware drivers for color/texel packing.
|
||||||
|
*/
|
||||||
|
#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
|
||||||
|
#if defined(__linux__)
|
||||||
|
#include <byteswap.h>
|
||||||
|
#define CPU_TO_LE32( x ) bswap_32( x )
|
||||||
|
#else /*__linux__*/
|
||||||
|
#include <sys/endian.h>
|
||||||
|
#define CPU_TO_LE32( x ) bswap32( x )
|
||||||
|
#endif /*__linux__*/
|
||||||
|
#define MESA_BIG_ENDIAN 1
|
||||||
|
#else
|
||||||
|
#define CPU_TO_LE32( x ) ( x )
|
||||||
|
#define MESA_LITTLE_ENDIAN 1
|
||||||
|
#endif
|
||||||
|
#define LE32_TO_CPU( x ) CPU_TO_LE32( x )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
|
||||||
|
#define CAPI _cdecl
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a macro so that asm functions can be linked into compilers other
|
||||||
|
* than GNU C
|
||||||
|
*/
|
||||||
|
#ifndef _ASMAPI
|
||||||
|
#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
|
||||||
|
#define _ASMAPI __cdecl
|
||||||
|
#else
|
||||||
|
#define _ASMAPI
|
||||||
|
#endif
|
||||||
|
#ifdef PTR_DECL_IN_FRONT
|
||||||
|
#define _ASMAPIP * _ASMAPI
|
||||||
|
#else
|
||||||
|
#define _ASMAPIP _ASMAPI *
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef USE_X86_ASM
|
||||||
|
#define _NORMAPI _ASMAPI
|
||||||
|
#define _NORMAPIP _ASMAPIP
|
||||||
|
#else
|
||||||
|
#define _NORMAPI
|
||||||
|
#define _NORMAPIP *
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/* This is a macro on IRIX */
|
||||||
|
#ifdef _P
|
||||||
|
#undef _P
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/* Turn off macro checking systems used by other libraries */
|
||||||
|
#ifdef CHECK
|
||||||
|
#undef CHECK
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ASSERT macro
|
||||||
|
*/
|
||||||
|
#if !defined(_WIN32_WCE)
|
||||||
|
#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
|
||||||
|
# define ASSERT(X) _CHECK(X)
|
||||||
|
#elif defined(DEBUG)
|
||||||
|
# define ASSERT(X) assert(X)
|
||||||
|
#else
|
||||||
|
# define ASSERT(X)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef NULL
|
||||||
|
#define NULL 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* LONGSTRING macro
|
||||||
|
* gcc -pedantic warns about long string literals, LONGSTRING silences that.
|
||||||
|
*/
|
||||||
|
#if !defined(__GNUC__) || (__GNUC__ < 2) || \
|
||||||
|
((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
|
||||||
|
# define LONGSTRING
|
||||||
|
#else
|
||||||
|
# define LONGSTRING __extension__
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef M_PI
|
||||||
|
#define M_PI (3.1415926536)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef M_E
|
||||||
|
#define M_E (2.7182818284590452354)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ONE_DIV_LN2
|
||||||
|
#define ONE_DIV_LN2 (1.442695040888963456)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ONE_DIV_SQRT_LN2
|
||||||
|
#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef FLT_MAX_EXP
|
||||||
|
#define FLT_MAX_EXP 128
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* USE_IEEE: Determine if we're using IEEE floating point
|
||||||
|
*/
|
||||||
|
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
|
||||||
|
defined(__s390x__) || defined(__powerpc__) || \
|
||||||
|
defined(__x86_64__) || \
|
||||||
|
defined(ia64) || defined(__ia64__) || \
|
||||||
|
defined(__hppa__) || defined(hpux) || \
|
||||||
|
defined(__mips) || defined(_MIPS_ARCH) || \
|
||||||
|
defined(__arm__) || \
|
||||||
|
defined(__sh__) || defined(__m32r__) || \
|
||||||
|
(defined(__sun) && defined(_IEEE_754)) || \
|
||||||
|
(defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
|
||||||
|
#define USE_IEEE
|
||||||
|
#define IEEE_ONE 0x3f800000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* START/END_FAST_MATH macros:
|
||||||
|
*
|
||||||
|
* START_FAST_MATH: Set x86 FPU to faster, 32-bit precision mode (and save
|
||||||
|
* original mode to a temporary).
|
||||||
|
* END_FAST_MATH: Restore x86 FPU to original mode.
|
||||||
|
*/
|
||||||
|
#if defined(__GNUC__) && defined(__i386__)
|
||||||
|
/*
|
||||||
|
* Set the x86 FPU control word to guarentee only 32 bits of precision
|
||||||
|
* are stored in registers. Allowing the FPU to store more introduces
|
||||||
|
* differences between situations where numbers are pulled out of memory
|
||||||
|
* vs. situations where the compiler is able to optimize register usage.
|
||||||
|
*
|
||||||
|
* In the worst case, we force the compiler to use a memory access to
|
||||||
|
* truncate the float, by specifying the 'volatile' keyword.
|
||||||
|
*/
|
||||||
|
/* Hardware default: All exceptions masked, extended double precision,
|
||||||
|
* round to nearest (IEEE compliant):
|
||||||
|
*/
|
||||||
|
#define DEFAULT_X86_FPU 0x037f
|
||||||
|
/* All exceptions masked, single precision, round to nearest:
|
||||||
|
*/
|
||||||
|
#define FAST_X86_FPU 0x003f
|
||||||
|
/* The fldcw instruction will cause any pending FP exceptions to be
|
||||||
|
* raised prior to entering the block, and we clear any pending
|
||||||
|
* exceptions before exiting the block. Hence, asm code has free
|
||||||
|
* reign over the FPU while in the fast math block.
|
||||||
|
*/
|
||||||
|
#if defined(NO_FAST_MATH)
|
||||||
|
#define START_FAST_MATH(x) \
|
||||||
|
do { \
|
||||||
|
static GLuint mask = DEFAULT_X86_FPU; \
|
||||||
|
__asm__ ( "fnstcw %0" : "=m" (*&(x)) ); \
|
||||||
|
__asm__ ( "fldcw %0" : : "m" (mask) ); \
|
||||||
|
} while (0)
|
||||||
|
#else
|
||||||
|
#define START_FAST_MATH(x) \
|
||||||
|
do { \
|
||||||
|
static GLuint mask = FAST_X86_FPU; \
|
||||||
|
__asm__ ( "fnstcw %0" : "=m" (*&(x)) ); \
|
||||||
|
__asm__ ( "fldcw %0" : : "m" (mask) ); \
|
||||||
|
} while (0)
|
||||||
|
#endif
|
||||||
|
/* Restore original FPU mode, and clear any exceptions that may have
|
||||||
|
* occurred in the FAST_MATH block.
|
||||||
|
*/
|
||||||
|
#define END_FAST_MATH(x) \
|
||||||
|
do { \
|
||||||
|
__asm__ ( "fnclex ; fldcw %0" : : "m" (*&(x)) ); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#elif defined(__WATCOMC__) && defined(__386__)
|
||||||
|
#define DEFAULT_X86_FPU 0x037f /* See GCC comments above */
|
||||||
|
#define FAST_X86_FPU 0x003f /* See GCC comments above */
|
||||||
|
void _watcom_start_fast_math(unsigned short *x,unsigned short *mask);
|
||||||
|
#pragma aux _watcom_start_fast_math = \
|
||||||
|
"fnstcw word ptr [eax]" \
|
||||||
|
"fldcw word ptr [ecx]" \
|
||||||
|
parm [eax] [ecx] \
|
||||||
|
modify exact [];
|
||||||
|
void _watcom_end_fast_math(unsigned short *x);
|
||||||
|
#pragma aux _watcom_end_fast_math = \
|
||||||
|
"fnclex" \
|
||||||
|
"fldcw word ptr [eax]" \
|
||||||
|
parm [eax] \
|
||||||
|
modify exact [];
|
||||||
|
#if defined(NO_FAST_MATH)
|
||||||
|
#define START_FAST_MATH(x) \
|
||||||
|
do { \
|
||||||
|
static GLushort mask = DEFAULT_X86_FPU; \
|
||||||
|
_watcom_start_fast_math(&x,&mask); \
|
||||||
|
} while (0)
|
||||||
|
#else
|
||||||
|
#define START_FAST_MATH(x) \
|
||||||
|
do { \
|
||||||
|
static GLushort mask = FAST_X86_FPU; \
|
||||||
|
_watcom_start_fast_math(&x,&mask); \
|
||||||
|
} while (0)
|
||||||
|
#endif
|
||||||
|
#define END_FAST_MATH(x) _watcom_end_fast_math(&x)
|
||||||
|
|
||||||
|
#elif defined(_MSC_VER) && defined(_M_IX86)
|
||||||
|
#define DEFAULT_X86_FPU 0x037f /* See GCC comments above */
|
||||||
|
#define FAST_X86_FPU 0x003f /* See GCC comments above */
|
||||||
|
#if defined(NO_FAST_MATH)
|
||||||
|
#define START_FAST_MATH(x) do {\
|
||||||
|
static GLuint mask = DEFAULT_X86_FPU;\
|
||||||
|
__asm fnstcw word ptr [x]\
|
||||||
|
__asm fldcw word ptr [mask]\
|
||||||
|
} while(0)
|
||||||
|
#else
|
||||||
|
#define START_FAST_MATH(x) do {\
|
||||||
|
static GLuint mask = FAST_X86_FPU;\
|
||||||
|
__asm fnstcw word ptr [x]\
|
||||||
|
__asm fldcw word ptr [mask]\
|
||||||
|
} while(0)
|
||||||
|
#endif
|
||||||
|
#define END_FAST_MATH(x) do {\
|
||||||
|
__asm fnclex\
|
||||||
|
__asm fldcw word ptr [x]\
|
||||||
|
} while(0)
|
||||||
|
|
||||||
|
#else
|
||||||
|
#define START_FAST_MATH(x) x = 0
|
||||||
|
#define END_FAST_MATH(x) (void)(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#define Elements(x) (sizeof(x)/sizeof(*(x)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* COMPILER_H */
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Mesa 3-D graphics library
|
* Mesa 3-D graphics library
|
||||||
* Version: 7.3
|
* Version: 7.5
|
||||||
*
|
*
|
||||||
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
|
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
|
||||||
* Copyright (C) 2008 VMware, Inc. All Rights Reserved.
|
* Copyright (C) 2008 VMware, Inc. All Rights Reserved.
|
||||||
|
@ -32,9 +32,6 @@
|
||||||
#define MESA_CONFIG_H_INCLUDED
|
#define MESA_CONFIG_H_INCLUDED
|
||||||
|
|
||||||
|
|
||||||
#include "main/mfeatures.h"
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \name OpenGL implementation limits
|
* \name OpenGL implementation limits
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -77,6 +77,7 @@
|
||||||
|
|
||||||
|
|
||||||
#include "glheader.h"
|
#include "glheader.h"
|
||||||
|
#include "mfeatures.h"
|
||||||
#include "imports.h"
|
#include "imports.h"
|
||||||
#if FEATURE_accum
|
#if FEATURE_accum
|
||||||
#include "accum.h"
|
#include "accum.h"
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#ifndef GLX_USE_APPLEGL
|
#ifndef GLX_USE_APPLEGL
|
||||||
|
|
||||||
#include "main/glheader.h"
|
#include "main/glheader.h"
|
||||||
|
#include "main/compiler.h"
|
||||||
#include "glapi/glapi.h"
|
#include "glapi/glapi.h"
|
||||||
#include "glapi/glapitable.h"
|
#include "glapi/glapitable.h"
|
||||||
#include "glapi/glthread.h"
|
#include "glapi/glthread.h"
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include "api_arrayelt.h"
|
#include "api_arrayelt.h"
|
||||||
#include "api_loopback.h"
|
#include "api_loopback.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "mfeatures.h"
|
||||||
#include "attrib.h"
|
#include "attrib.h"
|
||||||
#include "blend.h"
|
#include "blend.h"
|
||||||
#include "buffers.h"
|
#include "buffers.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "glheader.h"
|
#include "glheader.h"
|
||||||
|
#include "mfeatures.h"
|
||||||
#include "enums.h"
|
#include "enums.h"
|
||||||
#include "imports.h"
|
#include "imports.h"
|
||||||
|
|
||||||
|
@ -4973,8 +4974,6 @@ static const unsigned reduced_enums[1308] =
|
||||||
30, /* GL_ALL_CLIENT_ATTRIB_BITS */
|
30, /* GL_ALL_CLIENT_ATTRIB_BITS */
|
||||||
};
|
};
|
||||||
|
|
||||||
#define Elements(x) sizeof(x)/sizeof(*x)
|
|
||||||
|
|
||||||
typedef int (*cfunc)(const void *, const void *);
|
typedef int (*cfunc)(const void *, const void *);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,28 +1,8 @@
|
||||||
/**
|
|
||||||
* \file glheader.h
|
|
||||||
* Top-most include file.
|
|
||||||
*
|
|
||||||
* This is the top-most include file of the Mesa sources.
|
|
||||||
* It includes gl.h and all system headers which are needed.
|
|
||||||
* Other Mesa source files should \e not directly include any system
|
|
||||||
* headers. This allows system-dependent hacks/workarounds to be
|
|
||||||
* collected in one place.
|
|
||||||
*
|
|
||||||
* \note Actually, a lot of system-dependent stuff is now in imports.[ch].
|
|
||||||
*
|
|
||||||
* If you touch this file, everything gets recompiled!
|
|
||||||
*
|
|
||||||
* This file should be included before any other header in the .c files.
|
|
||||||
*
|
|
||||||
* Put compiler/OS/assembly pragmas and macros here to avoid
|
|
||||||
* cluttering other source files.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mesa 3-D graphics library
|
* Mesa 3-D graphics library
|
||||||
* Version: 6.5
|
* Version: 7.5
|
||||||
*
|
*
|
||||||
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
|
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
* copy of this software and associated documentation files (the "Software"),
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
@ -43,99 +23,22 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \file glheader.h
|
||||||
|
* Wrapper for GL/gl.h and GL/glext.h
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef GLHEADER_H
|
#ifndef GLHEADER_H
|
||||||
#define GLHEADER_H
|
#define GLHEADER_H
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#if defined(__alpha__) && defined(CCPML)
|
|
||||||
#include <cpml.h> /* use Compaq's Fast Math Library on Alpha */
|
|
||||||
#else
|
|
||||||
#include <math.h>
|
|
||||||
#endif
|
|
||||||
#include <limits.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#if defined(__linux__) && defined(__i386__)
|
|
||||||
#include <fpu_control.h>
|
|
||||||
#endif
|
|
||||||
#include <float.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
|
|
||||||
/* Get standard integer types */
|
|
||||||
#if defined(_MSC_VER)
|
|
||||||
|
|
||||||
typedef __int8 int8_t;
|
|
||||||
typedef unsigned __int8 uint8_t;
|
|
||||||
typedef __int16 int16_t;
|
|
||||||
typedef unsigned __int16 uint16_t;
|
|
||||||
# ifndef __eglplatform_h_
|
|
||||||
typedef __int32 int32_t;
|
|
||||||
# endif
|
|
||||||
typedef unsigned __int32 uint32_t;
|
|
||||||
typedef __int64 int64_t;
|
|
||||||
typedef unsigned __int64 uint64_t;
|
|
||||||
|
|
||||||
# if defined(_WIN64)
|
|
||||||
typedef __int64 intptr_t;
|
|
||||||
typedef unsigned __int64 uintptr_t;
|
|
||||||
# else
|
|
||||||
typedef __int32 intptr_t;
|
|
||||||
typedef unsigned __int32 uintptr_t;
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# define INT64_C(__val) __val##i64
|
|
||||||
# define UINT64_C(__val) __val##ui64
|
|
||||||
|
|
||||||
#else
|
|
||||||
# include <stdint.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Sun compilers define __i386 instead of the gcc-style __i386__ */
|
|
||||||
#ifdef __SUNPRO_C
|
|
||||||
# if !defined(__i386__) && defined(__i386)
|
|
||||||
# define __i386__
|
|
||||||
# elif !defined(__amd64__) && defined(__amd64)
|
|
||||||
# define __amd64__
|
|
||||||
# elif !defined(__sparc__) && defined(__sparc)
|
|
||||||
# define __sparc__
|
|
||||||
# endif
|
|
||||||
# if !defined(__volatile)
|
|
||||||
# define __volatile volatile
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
|
|
||||||
# define __WIN32__
|
|
||||||
# define finite _finite
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__WATCOMC__)
|
|
||||||
# define finite _finite
|
|
||||||
# pragma disable_message(201) /* Disable unreachable code warnings */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef WGLAPI
|
#ifdef WGLAPI
|
||||||
# undef WGLAPI
|
#undef WGLAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
|
#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) && !defined(BUILD_FOR_SNAP)
|
||||||
# if !defined(__GNUC__) /* mingw environment */
|
|
||||||
# pragma warning( disable : 4068 ) /* unknown pragma */
|
|
||||||
# pragma warning( disable : 4710 ) /* function 'foo' not inlined */
|
|
||||||
# pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */
|
|
||||||
# pragma warning( disable : 4127 ) /* conditional expression is constant */
|
|
||||||
# if defined(MESA_MINWARN)
|
|
||||||
# pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */
|
|
||||||
# pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */
|
|
||||||
# pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */
|
|
||||||
# pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */
|
|
||||||
# pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
|
# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
|
||||||
# define WGLAPI __declspec(dllexport)
|
# define WGLAPI __declspec(dllexport)
|
||||||
# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
|
# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
|
||||||
|
@ -146,31 +49,10 @@
|
||||||
#endif /* WIN32 / CYGWIN bracket */
|
#endif /* WIN32 / CYGWIN bracket */
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN.
|
|
||||||
* Do not use them unless absolutely necessary!
|
|
||||||
* Try to use a runtime test instead.
|
|
||||||
* For now, only used by some DRI hardware drivers for color/texel packing.
|
|
||||||
*/
|
|
||||||
#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
|
|
||||||
#if defined(__linux__)
|
|
||||||
#include <byteswap.h>
|
|
||||||
#define CPU_TO_LE32( x ) bswap_32( x )
|
|
||||||
#else /*__linux__*/
|
|
||||||
#include <sys/endian.h>
|
|
||||||
#define CPU_TO_LE32( x ) bswap32( x )
|
|
||||||
#endif /*__linux__*/
|
|
||||||
#define MESA_BIG_ENDIAN 1
|
|
||||||
#else
|
|
||||||
#define CPU_TO_LE32( x ) ( x )
|
|
||||||
#define MESA_LITTLE_ENDIAN 1
|
|
||||||
#endif
|
|
||||||
#define LE32_TO_CPU( x ) CPU_TO_LE32( x )
|
|
||||||
|
|
||||||
|
|
||||||
#define GL_GLEXT_PROTOTYPES
|
#define GL_GLEXT_PROTOTYPES
|
||||||
#include "GL/gl.h"
|
#include "GL/gl.h"
|
||||||
#include "GL/glext.h"
|
#include "GL/glext.h"
|
||||||
|
#include <GL/internal/glcore.h>
|
||||||
|
|
||||||
|
|
||||||
#ifndef GL_FIXED
|
#ifndef GL_FIXED
|
||||||
|
@ -192,129 +74,10 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP)
|
/**
|
||||||
#define CAPI _cdecl
|
* Special, internal token
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* This is a macro on IRIX */
|
|
||||||
#ifdef _P
|
|
||||||
#undef _P
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Turn off macro checking systems used by other libraries */
|
|
||||||
#ifdef CHECK
|
|
||||||
#undef CHECK
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Create a macro so that asm functions can be linked into compilers other
|
|
||||||
* than GNU C
|
|
||||||
*/
|
*/
|
||||||
#ifndef _ASMAPI
|
#define GL_SHADER_PROGRAM_MESA 0x9999
|
||||||
#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/
|
|
||||||
#define _ASMAPI __cdecl
|
|
||||||
#else
|
|
||||||
#define _ASMAPI
|
|
||||||
#endif
|
|
||||||
#ifdef PTR_DECL_IN_FRONT
|
|
||||||
#define _ASMAPIP * _ASMAPI
|
|
||||||
#else
|
|
||||||
#define _ASMAPIP _ASMAPI *
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_X86_ASM
|
|
||||||
#define _NORMAPI _ASMAPI
|
|
||||||
#define _NORMAPIP _ASMAPIP
|
|
||||||
#else
|
|
||||||
#define _NORMAPI
|
|
||||||
#define _NORMAPIP *
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Function inlining */
|
|
||||||
#if defined(__GNUC__)
|
|
||||||
# define INLINE __inline__
|
|
||||||
#elif defined(__MSC__)
|
|
||||||
# define INLINE __inline
|
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
# define INLINE __inline
|
|
||||||
#elif defined(__ICL)
|
|
||||||
# define INLINE __inline
|
|
||||||
#elif defined(__INTEL_COMPILER)
|
|
||||||
# define INLINE inline
|
|
||||||
#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100)
|
|
||||||
# define INLINE __inline
|
|
||||||
#elif defined(__SUNPRO_C) && defined(__C99FEATURES__)
|
|
||||||
# define INLINE inline
|
|
||||||
# define __inline inline
|
|
||||||
# define __inline__ inline
|
|
||||||
#elif (__STDC_VERSION__ >= 199901L) /* C99 */
|
|
||||||
# define INLINE inline
|
|
||||||
#else
|
|
||||||
# define INLINE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* If we build the library with gcc's -fvisibility=hidden flag, we'll
|
|
||||||
* use the PUBLIC macro to mark functions that are to be exported.
|
|
||||||
*
|
|
||||||
* We also need to define a USED attribute, so the optimizer doesn't
|
|
||||||
* inline a static function that we later use in an alias. - ajax
|
|
||||||
*/
|
|
||||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
|
|
||||||
# define PUBLIC __attribute__((visibility("default")))
|
|
||||||
# define USED __attribute__((used))
|
|
||||||
#else
|
|
||||||
# define PUBLIC
|
|
||||||
# define USED
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Some compilers don't like some of Mesa's const usage */
|
|
||||||
#ifdef NO_CONST
|
|
||||||
# define CONST
|
|
||||||
#else
|
|
||||||
# define CONST const
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(_WIN32_WCE)
|
|
||||||
#if defined(BUILD_FOR_SNAP) && defined(CHECKED)
|
|
||||||
# define ASSERT(X) _CHECK(X)
|
|
||||||
#elif defined(DEBUG)
|
|
||||||
# define ASSERT(X) assert(X)
|
|
||||||
#else
|
|
||||||
# define ASSERT(X)
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#if (!defined(__GNUC__) || __GNUC__ < 3) && (!defined(__IBMC__) || __IBMC__ < 900)
|
|
||||||
# define __builtin_expect(x, y) x
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* The __FUNCTION__ gcc variable is generally only used for debugging.
|
|
||||||
* If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
|
|
||||||
* Don't define it if using a newer Windows compiler.
|
|
||||||
*/
|
|
||||||
#ifndef __FUNCTION__
|
|
||||||
# if defined(__VMS)
|
|
||||||
# define __FUNCTION__ "VMS$NL:"
|
|
||||||
# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
|
|
||||||
(!defined(_MSC_VER) || _MSC_VER < 1300)
|
|
||||||
# if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
|
|
||||||
(defined(__SUNPRO_C) && defined(__C99FEATURES__))
|
|
||||||
# define __FUNCTION__ __func__
|
|
||||||
# else
|
|
||||||
# define __FUNCTION__ "<unknown>"
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#endif /* GLHEADER_H */
|
#endif /* GLHEADER_H */
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Mesa 3-D graphics library
|
* Mesa 3-D graphics library
|
||||||
* Version: 7.1
|
* Version: 7.5
|
||||||
*
|
*
|
||||||
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
|
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
|
||||||
*
|
*
|
||||||
|
@ -36,10 +36,8 @@
|
||||||
#define IMPORTS_H
|
#define IMPORTS_H
|
||||||
|
|
||||||
|
|
||||||
/* XXX some of the stuff in glheader.h should be moved into this file.
|
#include "compiler.h"
|
||||||
*/
|
|
||||||
#include "glheader.h"
|
#include "glheader.h"
|
||||||
#include <GL/internal/glcore.h>
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -47,26 +45,6 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/**********************************************************************/
|
|
||||||
/** \name General macros */
|
|
||||||
/*@{*/
|
|
||||||
|
|
||||||
#ifndef NULL
|
|
||||||
#define NULL 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/** gcc -pedantic warns about long string literals, LONGSTRING silences that */
|
|
||||||
#if !defined(__GNUC__) || (__GNUC__ < 2) || \
|
|
||||||
((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
|
|
||||||
# define LONGSTRING
|
|
||||||
#else
|
|
||||||
# define LONGSTRING __extension__
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*@}*/
|
|
||||||
|
|
||||||
|
|
||||||
/**********************************************************************/
|
/**********************************************************************/
|
||||||
/** Memory macros */
|
/** Memory macros */
|
||||||
/*@{*/
|
/*@{*/
|
||||||
|
@ -130,48 +108,10 @@ typedef union { GLfloat f; GLint i; } fi_type;
|
||||||
#define MAX_GLUSHORT 0xffff
|
#define MAX_GLUSHORT 0xffff
|
||||||
#define MAX_GLUINT 0xffffffff
|
#define MAX_GLUINT 0xffffffff
|
||||||
|
|
||||||
#ifndef M_PI
|
|
||||||
#define M_PI (3.1415926536)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef M_E
|
|
||||||
#define M_E (2.7182818284590452354)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ONE_DIV_LN2
|
|
||||||
#define ONE_DIV_LN2 (1.442695040888963456)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ONE_DIV_SQRT_LN2
|
|
||||||
#define ONE_DIV_SQRT_LN2 (1.201122408786449815)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef FLT_MAX_EXP
|
|
||||||
#define FLT_MAX_EXP 128
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Degrees to radians conversion: */
|
/* Degrees to radians conversion: */
|
||||||
#define DEG2RAD (M_PI/180.0)
|
#define DEG2RAD (M_PI/180.0)
|
||||||
|
|
||||||
|
|
||||||
/***
|
|
||||||
*** USE_IEEE: Determine if we're using IEEE floating point
|
|
||||||
***/
|
|
||||||
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
|
|
||||||
defined(__s390x__) || defined(__powerpc__) || \
|
|
||||||
defined(__x86_64__) || \
|
|
||||||
defined(ia64) || defined(__ia64__) || \
|
|
||||||
defined(__hppa__) || defined(hpux) || \
|
|
||||||
defined(__mips) || defined(_MIPS_ARCH) || \
|
|
||||||
defined(__arm__) || \
|
|
||||||
defined(__sh__) || defined(__m32r__) || \
|
|
||||||
(defined(__sun) && defined(_IEEE_754)) || \
|
|
||||||
(defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
|
|
||||||
#define USE_IEEE
|
|
||||||
#define IEEE_ONE 0x3f800000
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
*** SQRTF: single-precision square root
|
*** SQRTF: single-precision square root
|
||||||
***/
|
***/
|
||||||
|
@ -508,113 +448,6 @@ _mesa_is_pow_two(int x)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/***
|
|
||||||
*** START_FAST_MATH: Set x86 FPU to faster, 32-bit precision mode (and save
|
|
||||||
*** original mode to a temporary).
|
|
||||||
*** END_FAST_MATH: Restore x86 FPU to original mode.
|
|
||||||
***/
|
|
||||||
#if defined(__GNUC__) && defined(__i386__)
|
|
||||||
/*
|
|
||||||
* Set the x86 FPU control word to guarentee only 32 bits of precision
|
|
||||||
* are stored in registers. Allowing the FPU to store more introduces
|
|
||||||
* differences between situations where numbers are pulled out of memory
|
|
||||||
* vs. situations where the compiler is able to optimize register usage.
|
|
||||||
*
|
|
||||||
* In the worst case, we force the compiler to use a memory access to
|
|
||||||
* truncate the float, by specifying the 'volatile' keyword.
|
|
||||||
*/
|
|
||||||
/* Hardware default: All exceptions masked, extended double precision,
|
|
||||||
* round to nearest (IEEE compliant):
|
|
||||||
*/
|
|
||||||
#define DEFAULT_X86_FPU 0x037f
|
|
||||||
/* All exceptions masked, single precision, round to nearest:
|
|
||||||
*/
|
|
||||||
#define FAST_X86_FPU 0x003f
|
|
||||||
/* The fldcw instruction will cause any pending FP exceptions to be
|
|
||||||
* raised prior to entering the block, and we clear any pending
|
|
||||||
* exceptions before exiting the block. Hence, asm code has free
|
|
||||||
* reign over the FPU while in the fast math block.
|
|
||||||
*/
|
|
||||||
#if defined(NO_FAST_MATH)
|
|
||||||
#define START_FAST_MATH(x) \
|
|
||||||
do { \
|
|
||||||
static GLuint mask = DEFAULT_X86_FPU; \
|
|
||||||
__asm__ ( "fnstcw %0" : "=m" (*&(x)) ); \
|
|
||||||
__asm__ ( "fldcw %0" : : "m" (mask) ); \
|
|
||||||
} while (0)
|
|
||||||
#else
|
|
||||||
#define START_FAST_MATH(x) \
|
|
||||||
do { \
|
|
||||||
static GLuint mask = FAST_X86_FPU; \
|
|
||||||
__asm__ ( "fnstcw %0" : "=m" (*&(x)) ); \
|
|
||||||
__asm__ ( "fldcw %0" : : "m" (mask) ); \
|
|
||||||
} while (0)
|
|
||||||
#endif
|
|
||||||
/* Restore original FPU mode, and clear any exceptions that may have
|
|
||||||
* occurred in the FAST_MATH block.
|
|
||||||
*/
|
|
||||||
#define END_FAST_MATH(x) \
|
|
||||||
do { \
|
|
||||||
__asm__ ( "fnclex ; fldcw %0" : : "m" (*&(x)) ); \
|
|
||||||
} while (0)
|
|
||||||
|
|
||||||
#elif defined(__WATCOMC__) && defined(__386__)
|
|
||||||
#define DEFAULT_X86_FPU 0x037f /* See GCC comments above */
|
|
||||||
#define FAST_X86_FPU 0x003f /* See GCC comments above */
|
|
||||||
void _watcom_start_fast_math(unsigned short *x,unsigned short *mask);
|
|
||||||
#pragma aux _watcom_start_fast_math = \
|
|
||||||
"fnstcw word ptr [eax]" \
|
|
||||||
"fldcw word ptr [ecx]" \
|
|
||||||
parm [eax] [ecx] \
|
|
||||||
modify exact [];
|
|
||||||
void _watcom_end_fast_math(unsigned short *x);
|
|
||||||
#pragma aux _watcom_end_fast_math = \
|
|
||||||
"fnclex" \
|
|
||||||
"fldcw word ptr [eax]" \
|
|
||||||
parm [eax] \
|
|
||||||
modify exact [];
|
|
||||||
#if defined(NO_FAST_MATH)
|
|
||||||
#define START_FAST_MATH(x) \
|
|
||||||
do { \
|
|
||||||
static GLushort mask = DEFAULT_X86_FPU; \
|
|
||||||
_watcom_start_fast_math(&x,&mask); \
|
|
||||||
} while (0)
|
|
||||||
#else
|
|
||||||
#define START_FAST_MATH(x) \
|
|
||||||
do { \
|
|
||||||
static GLushort mask = FAST_X86_FPU; \
|
|
||||||
_watcom_start_fast_math(&x,&mask); \
|
|
||||||
} while (0)
|
|
||||||
#endif
|
|
||||||
#define END_FAST_MATH(x) _watcom_end_fast_math(&x)
|
|
||||||
|
|
||||||
#elif defined(_MSC_VER) && defined(_M_IX86)
|
|
||||||
#define DEFAULT_X86_FPU 0x037f /* See GCC comments above */
|
|
||||||
#define FAST_X86_FPU 0x003f /* See GCC comments above */
|
|
||||||
#if defined(NO_FAST_MATH)
|
|
||||||
#define START_FAST_MATH(x) do {\
|
|
||||||
static GLuint mask = DEFAULT_X86_FPU;\
|
|
||||||
__asm fnstcw word ptr [x]\
|
|
||||||
__asm fldcw word ptr [mask]\
|
|
||||||
} while(0)
|
|
||||||
#else
|
|
||||||
#define START_FAST_MATH(x) do {\
|
|
||||||
static GLuint mask = FAST_X86_FPU;\
|
|
||||||
__asm fnstcw word ptr [x]\
|
|
||||||
__asm fldcw word ptr [mask]\
|
|
||||||
} while(0)
|
|
||||||
#endif
|
|
||||||
#define END_FAST_MATH(x) do {\
|
|
||||||
__asm fnclex\
|
|
||||||
__asm fldcw word ptr [x]\
|
|
||||||
} while(0)
|
|
||||||
|
|
||||||
#else
|
|
||||||
#define START_FAST_MATH(x) x = 0
|
|
||||||
#define END_FAST_MATH(x) (void)(x)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return 1 if this is a little endian machine, 0 if big endian.
|
* Return 1 if this is a little endian machine, 0 if big endian.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -34,20 +34,16 @@
|
||||||
#define TYPES_H
|
#define TYPES_H
|
||||||
|
|
||||||
|
|
||||||
#include "glheader.h"
|
#include "main/glheader.h"
|
||||||
|
#include "main/config.h"
|
||||||
|
#include "main/compiler.h"
|
||||||
|
#include "main/mfeatures.h"
|
||||||
#include <GL/internal/glcore.h> /* __GLcontextModes (GLvisual) */
|
#include <GL/internal/glcore.h> /* __GLcontextModes (GLvisual) */
|
||||||
#include "config.h" /* Hardwired parameters */
|
|
||||||
#include "glapi/glapi.h"
|
#include "glapi/glapi.h"
|
||||||
#include "math/m_matrix.h" /* GLmatrix */
|
#include "math/m_matrix.h" /* GLmatrix */
|
||||||
#include "bitset.h"
|
#include "bitset.h"
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Special, internal token
|
|
||||||
*/
|
|
||||||
#define GL_SHADER_PROGRAM_MESA 0x9999
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Color channel data type.
|
* Color channel data type.
|
||||||
*/
|
*/
|
||||||
|
@ -126,7 +122,6 @@ struct gl_texture_format;
|
||||||
struct gl_texture_image;
|
struct gl_texture_image;
|
||||||
struct gl_texture_object;
|
struct gl_texture_object;
|
||||||
struct st_context;
|
struct st_context;
|
||||||
struct pipe_surface;
|
|
||||||
typedef struct __GLcontextRec GLcontext;
|
typedef struct __GLcontextRec GLcontext;
|
||||||
typedef struct __GLcontextModesRec GLvisual;
|
typedef struct __GLcontextModesRec GLvisual;
|
||||||
typedef struct gl_framebuffer GLframebuffer;
|
typedef struct gl_framebuffer GLframebuffer;
|
||||||
|
@ -3166,7 +3161,4 @@ enum _debug
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define Elements(x) sizeof(x)/sizeof(*(x))
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* TYPES_H */
|
#endif /* TYPES_H */
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "glheader.h"
|
#include "mfeatures.h"
|
||||||
#if FEATURE_colortable
|
#if FEATURE_colortable
|
||||||
#include "colortab.h"
|
#include "colortab.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "glheader.h"
|
#include "glheader.h"
|
||||||
|
#include "mfeatures.h"
|
||||||
#include "colormac.h"
|
#include "colormac.h"
|
||||||
#if FEATURE_colortable
|
#if FEATURE_colortable
|
||||||
#include "colortab.h"
|
#include "colortab.h"
|
||||||
|
|
|
@ -25,12 +25,13 @@
|
||||||
*
|
*
|
||||||
**************************************************************************/
|
**************************************************************************/
|
||||||
|
|
||||||
#include "main/imports.h"
|
#include "main/mfeatures.h"
|
||||||
#if FEATURE_convolve
|
#if FEATURE_convolve
|
||||||
#include "main/convolve.h"
|
#include "main/convolve.h"
|
||||||
#endif
|
#endif
|
||||||
#include "main/enums.h"
|
#include "main/enums.h"
|
||||||
#include "main/image.h"
|
#include "main/image.h"
|
||||||
|
#include "main/imports.h"
|
||||||
#include "main/macros.h"
|
#include "main/macros.h"
|
||||||
#include "main/mipmap.h"
|
#include "main/mipmap.h"
|
||||||
#include "main/pixel.h"
|
#include "main/pixel.h"
|
||||||
|
|
Loading…
Reference in New Issue